Issue#158 1 (#160)

* 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

* limit axis and varname to 127 characters

* limit axis and varname to 127 characters

* limit axis and varname to 127 characters

*  get rid of pdb

* pep8 dataset.py

* pep8 crossSection.py from regrid2

Author: dnadeau4

Lib/dataset.py

@@ -26,6 +26,7 @@
 from tvariable import asVariable
 from cdmsNode import CdDatatypes
 import convention
+import warnings
 
 # Default is serial mode until setNetcdfUseParallelFlag(1) is called
 rk = 0
@@ -1243,7 +1244,8 @@ def __init__(self, path, mode, hostObj=None, mpiBarrier=False):
                                         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)
+                                        grid = FileRectGrid(
+                                            self, gridname, lat, lon, gridkey[2], gridtype)
 
                         self.grids[grid.id] = grid
                         self._gridmap_[gridkey] = grid
@@ -1432,6 +1434,11 @@ def copyAxis(self, axis, newname=None, unlimited=0,
         if newname is None:
             newname = axis.id
 
+        if len(newname) > 127:
+            msg = "axis name has more than 127 characters, name will be truncate"
+            warnings.warn(msg, UserWarning)
+            newname = newname[:127] if len(newname) > 127 else newname
+
         # If the axis already exists and has the same values, return existing
         if newname in self.axes:
             newaxis = self.axes[newname]
@@ -1979,6 +1986,12 @@ def write(self, var, attributes=None, axes=None, extbounds=None, id=None,
             varid = var.id
         else:
             varid = id
+
+        if len(varid) > 127:
+            msg = "varid name has more than 127 characters, name will be truncate"
+            warnings.warn(msg, UserWarning)
+            varid = varid[:127] if len(varid) > 127 else varid
+
         if varid in self.variables:
             if pack:
                 raise CDMSError(

regrid2/Lib/crossSection.py

@@ -232,7 +232,7 @@ def __call__(self, ar, missing=None, order=None, method="log"):
 
         # Reconstruct the same class as on input
         # Mask fill_value and return results
-        print "INPUT IS VAR:",inputIsVariable
+        print "INPUT IS VAR:", inputIsVariable
         if inputIsVariable == 1:
             result = numpy.ma.masked_values(outar, missing)
             result = cdms2.createVariable(result, fill_value=missing,
@@ -594,18 +594,18 @@ def generic_wts_bnds(lat):
             newLat = lat.clone()
             newLat.setBounds(None)
         bnds = lat.getBounds()
-    except: # just an array....
+    except BaseException:
         newLat = cdms2.createAxis(lat)
         newLat.setBounds(None)
         bnds = newLat.getBounds()
-    outBnds = bnds[:,0].tolist()
+    outBnds = bnds[:, 0].tolist()
     outBnds.append(bnds[-1][-1])
     outBnds = numpy.array(outBnds)
-    wts = [ outBnds[i+1] - outBnds[i] for i in range(len(lat))]
+    wts = [outBnds[i + 1] - outBnds[i] for i in range(len(lat))]
     wts = numpy.array(wts) / numpy.sum(wts)
     return wts, outBnds
 
-    
+
 def get_latitude_wts_bnds(checklatpass):
     """        #-------------------------------------------------------------------
     #

tests/test_gen_grid.py

@@ -8,7 +8,6 @@
 import os
 import sys
 import basetest
-import pdb
 
 
 class TestGenericGrids(basetest.CDMSBaseTest):

tests/test_longname.py

@@ -0,0 +1,53 @@
+import cdms2
+import os
+import numpy
+import cdat_info
+import basetest
+import MV2
+
+
+class TestFormats(basetest.CDMSBaseTest):
+
+    def testAxisID(self):
+        a = MV2.ones((12,12))
+        ax = cdms2.createAxis(MV2.arange(12))
+        ax.id = "1234567890"*26
+        a.setAxis(0,ax)
+        with cdms2.open("bad.nc","w") as f:
+            f.write(a)
+        f=cdms2.open("bad.nc")
+        listdim = f.listdimension()
+        self.assertEqual(listdim[1], ax.id[0:127])
+        f.close()
+
+    def testVarID(self):
+        NLAT=16
+        NLON=32
+        latarr = numpy.ma.arange(NLAT) * (180. / (NLAT - 1)) - 90.
+        lonarr = numpy.ma.arange(NLON) * (360.0 / NLON)
+        timearr = numpy.ma.array([0.0, 366.0, 731.0])
+        u = self.test_arr[0]
+        tobj = cdms2.createAxis(id='time', data=timearr)
+        tobj.units = 'days since 2000-1-1'
+        latobj = cdms2.createAxis(id='latitude', data=latarr)
+        latobj.units = 'degrees_north'
+        lonobj = cdms2.createAxis(id='longitude', data=lonarr)
+        lonobj.units = 'degrees_east'
+        varid = "1234567890"*26
+        var = cdms2.createVariable(u,id=varid, typecode=numpy.float, axes=(tobj, latobj, lonobj))
+        var.units = 'm/s'
+        with cdms2.open("bad.nc","w") as f:
+            f.write(var)
+        f.close()
+        f=cdms2.open("bad.nc")
+        listvar = f.listvariables()
+        self.assertEqual(listvar[2], varid[:127])
+        f.close()
+       
+    def tearDown(self):
+        os.unlink("bad.nc")
+
+
+
+if __name__ == "__main__":
+    basetest.run()