Merge pull request #19 from ocefpaf/pysgrid

Update code to use latest pysgrid...
pyoceans · Sep 2, 2016 · 0003101 · 0003101
2 parents 8b67ec1 + b934f42
commit 0003101
Show file tree

Hide file tree

Showing 12 changed files with 155 additions and 206 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: python
 
+sudo: false
+
 env:
     - CONDA="python=2.7"
     - CONDA="python=3.4"
@@ -9,11 +11,12 @@ before_install:
     - wget http://bit.ly/miniconda -O miniconda.sh
     - bash miniconda.sh -b -p $HOME/miniconda
     - export PATH="$HOME/miniconda/bin:$PATH"
-    - conda update --yes conda
-    - conda config --add channels ioos -f
-    - travis_retry conda create --yes -n TEST $CONDA --file requirements.txt
+    - conda update --yes --all
+    - conda config --add channels conda-forge --force
+
+install:
+    - conda create --yes -n TEST $CONDA --file requirements.txt --file requirements-dev.txt
     - source activate TEST
-    - conda install --yes --file requirements-dev.txt
     # GUI.
     - "export DISPLAY=:99.0"
     - "sh -e /etc/init.d/xvfb start"

diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,10 @@
 Changelog
 ---------
 
+Version 0.2.1
+
+* Use latest `pysgrid` API.
+
 Version 0.2.0
 
 * Parse cubes with more than one `X`, `Y` axis.

diff --git a/README.rst b/README.rst
@@ -1,6 +1,12 @@
 gridgeo
 -------
 
+.. image:: https://travis-ci.org/pyoceans/gridgeo.svg?branch=master
+    :target: https://travis-ci.org/pyoceans/gridgeo
+
+.. image:: https://zenodo.org/badge/5715/pyoceans/gridgeo.svg
+   :target: https://zenodo.org/badge/latestdoi/5715/pyoceans/gridgeo
+
 Convert ocean numerical models grids,
 including UGRID and SGRID compliant files,
 to a variety of geo-like objects (GeoJSON, TopoJSON, and Shapefile).
diff --git a/gridgeo/__init__.py b/gridgeo/__init__.py
@@ -3,7 +3,7 @@
 from .gridgeo import GridGeo
 from .utilities import load_grid, rasterize
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 __all__ = ['GridGeo',
            'load_grid',

diff --git a/gridgeo/utilities.py b/gridgeo/utilities.py
@@ -3,11 +3,7 @@
 
 import pyugrid
 import pysgrid
-
 import numpy as np
-
-from pysgrid.custom_exceptions import SGridNonCompliantError
-
 from netCDF4 import Dataset
 from shapely.geometry.polygon import Polygon
 
@@ -37,11 +33,11 @@ def load_grid(nc):
         nc = Dataset(nc)
 
     try:
-        grid = pysgrid.from_nc_dataset(nc)
+        grid = pysgrid.load_grid(nc)
         polygons = _parse_sgrid(grid)
         mesh = 'sgrid'
         return grid, polygons, mesh
-    except (SGridNonCompliantError, KeyError):
+    except (ValueError, KeyError):
         pass
     try:
         grid = pyugrid.UGrid.from_nc_dataset(nc)
@@ -72,11 +68,13 @@ def _parse_sgrid(sgrid):
     """
     Return a polygons generator from an `sgrid` object.
 
-    NOTE: Works only for the grid center. The edges are not implemented in
-    `pysgrid` yet.
+    FIXME: Creating a fake grid for the grid center.
+    We should honor the SGRID conventions and make a quad cell grid from the
+    nodes and instead.
 
     """
-    coords = sgrid.centers.copy()
+    coords = np.concatenate([sgrid.center_lon[:][..., None],
+                             sgrid.center_lat[:][..., None, ]], axis=2)
     return _make_grid(coords)
 
 

diff --git a/notebooks/example_gridgeo_generic_grid.ipynb b/notebooks/example_gridgeo_generic_grid.ipynb
diff --git a/notebooks/example_gridgeo_non-compliant.ipynb b/notebooks/example_gridgeo_non-compliant.ipynb
diff --git a/notebooks/example_gridgeo_sgrid.ipynb b/notebooks/example_gridgeo_sgrid.ipynb
diff --git a/notebooks/example_gridgeo_sgrid_all_grids_via_cube.ipynb b/notebooks/example_gridgeo_sgrid_all_grids_via_cube.ipynb
diff --git a/notebooks/example_gridgeo_ugrid.ipynb b/notebooks/example_gridgeo_ugrid.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -1,8 +1,7 @@
-netCDF4 >=1.2.0,<1.2.2
+netCDF4
 pysgrid
 pyugrid
 fiona
 shapely
 iris
 cartopy
-matplotlib
diff --git a/tests/test_sgrid.py b/tests/test_sgrid.py
@@ -23,7 +23,7 @@ def test_nc_from_string():
 
 
 def test_grid():
-    assert isinstance(grid.grid, pysgrid.SGrid2D)
+    assert isinstance(grid.grid, pysgrid.SGrid)
 
 
 def test_mesh():