Issue#150 gpcp (#152)

* Fix CF-1 Conventions for GPCP

* Fix GPCP and break other tests

* Check dimension of coords and pep8 dataset.py

* Add GPCP test

* Delete fvariable default missing_value

* change test for DRS

* temporarly disable tests

* create rectangular grid for axis of length 1

* fix GPCP grid

* fix fill_value comparison to N/A

* fix array comparison issue

* remove space

* add BaseException to try statement

Author: doutriaux1

Lib/axis.py

@@ -188,7 +188,6 @@ def mapLinearIntersection(xind, yind, iind,
                           aMinusEps, aPlusEps, bPlusEps, bMinusEps,
                           boundLeft, nodeSubI, boundRight):
     """
-
     Return true iff the coordinate interval (a,b) intersects the node
     nodeSubI or cell bounds [boundLeft,boundRight], where the interval
     (a,b) is defined by:

Lib/dataset.py

@@ -1238,8 +1238,13 @@ def __init__(self, path, mode, hostObj=None, mpiBarrier=False):
                                 grid = FileCurveGrid(
                                     lat, lon, gridname, parent=self, maskvar=maskvar)
                             else:
-                                grid = FileGenericGrid(
-                                    lat, lon, gridname, parent=self, maskvar=maskvar)
+                                try:
+                                    grid = FileGenericGrid(
+                                        lat, lon, gridname, parent=self, maskvar=maskvar)
+                                except BaseException:
+                                    if(lat.rank() == 1 and lon.rank() == 1):
+                                        grid = FileRectGrid(self, gridname, lat, lon, gridkey[2], gridtype)
+
                         self.grids[grid.id] = grid
                         self._gridmap_[gridkey] = grid
 

Lib/fvariable.py

@@ -27,11 +27,11 @@ def __init__(self, parent, varname, cdunifobj=None):
             if '_FillValue' in self.__dict__.keys():
                 self.__dict__['missing_value'] = self.__dict__['_FillValue']
                 self.attributes['missing_value'] = self.__dict__['_FillValue']
-            if self.__dict__['missing_value'] is None:
-                self.__dict__[
-                    'missing_value'] = numpy.ma.default_fill_value(self)
-                self.attributes['missing_value'] = numpy.ma.default_fill_value(
-                    self)
+#            if self.__dict__['missing_value'] is None:
+#                self.__dict__[
+#                    'missing_value'] = numpy.ma.default_fill_value(self)
+#                self.attributes['missing_value'] = numpy.ma.default_fill_value(
+#                    self)
 
         val = self.__cdms_internals__ + ['name_in_file', ]
         self.___cdms_internals__ = val

share/test_data_files.txt

@@ -34,6 +34,7 @@ bae6d4d96aeb7faafee00f2a906392a5  era40_tas_sample.nc
 a58748f192e02ae1ec2cf9375a1141cc  161122_RobertPincus_multiple_input4MIPs_radiation_RFMIP_UColorado-RFMIP-20161122_none.nc
 fe00a043c990b2cfd8ff1e2f9e9c4cc0  tas_GFDL-ESM2G_Amon_historical_r1i1p1_198501-200512-clim.nc 
 4f8e5dcfe78e4be26af2c2440971bee5  stereographic.nc
+6c5bcd38ce3f77954e4353d2b9cba2f4  gpcp_cdr_v23rB1_y2016_m08.nc
 f515f21f4a62d182617f0ae24f60e495  20160520.A_WCYCL1850.ne30_oEC.edison.alpha6_01_ANN_climo_Q.nc
 c85f1abcd5769f4056209413e64d894a  MERRA_ANN_climo_SHUM.nc
 43d54b60e1b7b46b9dd0720c85e4a3a3  vmro3_input4MIPs_ozone_DAMIP_CCMI-hist-stratO3-1-0_gr_185001_nco.nc

tests/test_all_formats.py

@@ -17,7 +17,8 @@ def testHDF(self):
     def testDRS(self):
         f = self.getDataFile("dvtest1.dic")
         data = f['a']
-        self.assertEqual(data.missing_value, 1e20)
+#        self.assertEqual(data.missing_value, 1e20)
+        self.assertEqual(data.time, '15:17:00')
 
     def testDAP(self):
         f = cdms2.open(
@@ -48,6 +49,19 @@ def testGRIB2(self):
         data = f['wvhgtsfc']
         self.assertEqual(data.missing_value, 9.999e20)
 
+    def testnetCDF(self):
+        f = self.getDataFile("stereographic.nc")
+        data = f('seaice_conc_cdr')
+        self.assertAlmostEqual(data.mean(), 0.143803220111, 10)
+        self.assertEqual(data.max(), 1.0)
+
+    def testGPCP(self):
+        f = self.getDataFile("gpcp_cdr_v23rB1_y2016_m08.nc")
+        data = f('precip')
+        self.assertAlmostEqual(data.mean(), 2.40109777451, 8)
+        self.assertAlmostEqual(data.max(), 30.859095, 5)
+        self.assertEqual(data.min(), 0.0)
+
 
 if __name__ == "__main__":
     basetest.run()