Changeset 1107 in lmdz_wrf

Timestamp:

Sep 16, 2016, 2:55:39 PM (9 years ago)

Author:

lfita

Message:

Fixing `sellonlatbox'
Adding `numpydarray' as type in 'set_attributek'

File:

• trunk/tools/nc_var_tools.py (modified) (11 diffs)

trunk/tools/nc_var_tools.py

@@ -872 +872 @@
         elif attrkind == type(np.float64(1.)):
             attrvalue = np.float64(attrval)
+        elif attrkind == type(np.array([1.,2.])):
+            attrvalue = attrval
         else:
             print errormsg
@@ -6056 +6058 @@
     latinf = variable_inf(latobj)
 
-    lonv = lonobj[:]
-    latv = latobj[:]
+    if len(lonobj.shape) <= 2:
+        lonv = lonobj[:]
+        latv = latobj[:]
+    else:
+        print warnmsg
+        print '  ' + fname + ': assuming that lon/lat is constant to the first dimension!!'
+        print '    shape lon:', lonobj.shape, 'lat:', latobj.shape
+        lonv = lonobj[0,]
+        latv = latobj[0,]
 
     if varn == 'all':
@@ -6101 +6110 @@
     malat = ma.masked_outside(latv,latSW,latNE)
 
-    if len(lonv.shape) == 1:
+    if len(lonobj.shape) == 1:
         dlonn = loninf.dimns[0]
         dlatn = latinf.dimns[0]
@@ -6109 +6118 @@
         malonv = ma.array(lonv, mask=malonlat)
         malatv = ma.array(latv, mask=malonlat)
-    elif len(lonv.shape) == 2:
+    elif len(lonobj.shape) == 2:
         dlonn = loninf.dimns[1]
         dlatn = loninf.dimns[0]
@@ -6117 +6126 @@
         malonv = ma.array(lonv, mask=malonlat)
         malatv = ma.array(latv, mask=malonlat)
-    elif len(lonv.shape) == 3:
-        print warnmsg
-        print '  ' + fname + ': assuming that lon/lat is constant to the first dimension!!'
-        print '    shape lon:', lonv.shape, 'lat:', latv.shape
+    elif len(lonobj.shape) == 3:
         dlonn = loninf.dimns[2]
         dlatn = loninf.dimns[1]
-        dimx = lonv.shape[2]
-        dimy = lonv.shape[1]
+        dimx = lonv.shape[1]
+        dimy = lonv.shape[0]
         malonlat = np.zeros((dimy,dimx), dtype=bool)
         malonlat = malon.mask + malat.mask
@@ -6141 +6147 @@
     xlat = malat.max()
 
-    print '  ' + fname + ': data box: SW', nlon, nlat,'NE:',xlon,xlat 
+    print '  ' + fname + ': data box: SW', nlon, nlat,'NE:',xlon,xlat
+    print '  ' + fname + ': name of the longitudinal dimension:', dlonn,             \
+      'latitudinal:', dlatn
 
     ilon = dimx
@@ -6180 +6188 @@
 
     print 'ilon elon ilat elat:', ilon, elon, ilat, elat
-#    newdimx = elon - ilon + 1
-#    newdimy = elat - ilat + 1
-    newdimx = dimx - np.sum(malonv.mask)
-    newdimy = dimy - np.sum(malatv.mask)
+    newdimx = elon - ilon + 1
+    newdimy = elat - ilat + 1
 
     if len(malon.shape) == 1:
@@ -6240 +6246 @@
         for dimn in varinf.dimns:
             if not gen.searchInlist(newncobj.dimensions, dimn):
-                newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
+                if objfile.dimensions[dimn].isunlimited():
+                    newncobj.createDimension(dimn, None)
+                else:
+                    newncobj.createDimension(dimn, len(objfile.dimensions[dimn]))
 # Very special case when we have for example a list of stations (which is the case!)
             if dimn == dlonn and dimx != dimy: 
@@ -6248 +6257 @@
             else:
                 varslice.append(slice(0,len(objfile.dimensions[dimn])))
+                print fname + '; Lluis here! dimn', dimn
 
         if varinf.FillValue is not None:
@@ -6256 +6266 @@
 
         if dimx != dimy:
+            print fname + '; Lluis; varslice:', varslice,'shape newvar:', newvar.shape
             newvar[:] = varobj[tuple(varslice)]
         else:
@@ -6288 +6299 @@
     for atrn in objfile.ncattrs():
         attrv = objfile.getncattr(atrn)
+        print fname + '; Lluis attrn, attrv, type:', atrn, attrv, type(attrv)
         newattr = set_attributek(newncobj, atrn, attrv, type(attrv))