fix setGrid

.travis.yml

@@ -20,7 +20,7 @@ before_install:
 script:
 #- conda install -c uvcdat/label/nightly -c conda-forge -c uvcdat libcf distarray cdtime libcdms cdat_info numpy esmf esmpy libdrs_f pyopenssl nose requests flake8
 - conda create -n py3 python=3.6
-- conda install -n py3 -c conda-forge -c uvcdat libcf distarray cdtime libcdms cdat_info numpy libdrs_f pyopenssl nose requests flake8 myproxyclient
+- conda install -n py3 -c conda-forge -c uvcdat libcf distarray cdtime libcdms cdat_info numpy libdrs_f pyopenssl nose requests flake8 myproxyclient libnetcdf=4.4.1.1=9
 - source activate py3
 - if [ "$TRAVIS_OS_NAME" = "linux" ]; then conda install -n py3 -c nesii/channel/dev-esmf -c conda-forge esmpy=7.1.0.dev34; fi
 - if [ "$TRAVIS_OS_NAME" = "osx" ]; then conda install -n py3 -c nadeau1 -c conda-forge esmf esmpy; fi

Lib/MV2.py

@@ -340,6 +340,14 @@ def _conv_axis_arg(axis):
         axis = 0
     return axis
 
+def squeeze(x):
+    "squeze array"
+    ta = _makeMaskedArg(x)
+    maresult = numpy.squeeze(x._data)
+    axes, attributes, id, grid = _extractMetadata(x)
+    return TransientVariable(
+    maresult, axes=axes, attributes=attributes, grid=grid, id=id)
+
 
 def is_masked(x):
     "Is x a 0-D masked value?"

Lib/avariable.py

@@ -1497,6 +1497,9 @@ def getGridIndices(self):
 
     # numpy.ma overrides
 
+    def squeeze(self):
+        return(MV.squeeze(self))
+
     def __getitem__(self, key):
         if isinstance(key, tuple):
             speclist = self._process_specs(key, {})

Lib/hgrid.py

@@ -676,7 +676,7 @@ def isClose(self, g):
     def checkAxes(self, axes):
         """Return 1 iff every element of self.getAxisList() is in the list 'axes'."""
         for item in self.getAxisList():
-            if item not in axes:
+            if item.shape not in [axis.shape for axis in axes]:
                 result = 0
                 break
         else:

Lib/tvariable.py

@@ -121,6 +121,8 @@ def __array_finalize__(self, obj):
     def __copy__(self):
         return numpy.ma.MaskedArray.copy(self)
 
+    squeeze = AbstractVariable.squeeze
+
     __mul__ = AbstractVariable.__mul__
     __rmul__ = AbstractVariable.__rmul__
     __imul__ = AbstractVariable.__imul__

ci-support/circleci_mac_dep.sh

@@ -12,7 +12,7 @@ echo $cmd
 $cmd
 
 # Create Python 3 environment
-cmd="conda create -n py3 -c uvcdat/label/nightly -c conda-forge -c uvcdat libcf distarray cdtime libcdms cdat_info numpy libdrs_f pyopenssl nose requests flake8 myproxyclient"
+cmd="conda create -n py3 -c uvcdat/label/nightly -c conda-forge -c uvcdat libcf distarray cdtime libcdms cdat_info numpy libdrs_f pyopenssl nose requests flake8 myproxyclient libnetcdf=4.4.1.1=9"
 echo $cmd
 $cmd