Changeset 1474 in lmdz_wrf for trunk

Timestamp:

Mar 29, 2017, 9:55:16 PM (8 years ago)

Author:

lfita

Message:

Fixing 1D for 'sellonlatbox'

File:

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

trunk/tools/nc_var_tools.py

@@ -6294 +6294 @@
         quit(-1)
 
-    malon = ma.masked_outside(lonv,lonSW,lonNE)
-    malat = ma.masked_outside(latv,latSW,latNE)
+    if lonSW < lonNE:
+        malon = ma.masked_outside(lonv,lonSW,lonNE)
+    else:
+        malon = ma.masked_outside(lonv,lonNE,lonSW)
+
+    if latSW < latNE:
+        malat = ma.masked_outside(latv,latSW,latNE)
+    else:
+        malat = ma.masked_outside(latv,latNE,latSW)
 
     if len(lonobj.shape) == 1:
@@ -6302 +6309 @@
         dimx = lonv.shape[0]
         dimy = latv.shape[0]
-        malonlat = malon.mask + malat.mask
-        malonv = ma.array(lonv, mask=malonlat)
-        malatv = ma.array(latv, mask=malonlat)
+        malonlat = np.meshgrid(malon.mask,malat.mask)
+        malonv = ma.array(lonv, mask=malon)
+        malatv = ma.array(latv, mask=malat)
     elif len(lonobj.shape) == 2:
         dlonn = loninf.dimns[1]
@@ -6335 +6342 @@
 
     print '  ' + fname + ': data box: SW', nlon, nlat,'NE:',xlon,xlat
-    print '  ' + fname + ': name of the longitudinal dimension:', dlonn,             \
-      'latitudinal:', dlatn
+    print '  ' + fname + ": name of the longitudinal dimension: '" + dlonn +         \
+      "' latitudinal: '" + dlatn
 
     ilon = dimx
@@ -6345 +6352 @@
         for j in range(dimy):
             for i in range(dimx):
-                if malonlat[j,i] == False and i < ilon: 
+                if malonlat.mask[j,i] == False and i < ilon: 
                     ilon = i
-                if malonlat[j,i] == False and i > elon: 
+                if malonlat.mask[j,i] == False and i > elon: 
                     elon = i
-                if malonlat[j,i] == False and j < ilat: 
+                if malonlat.mask[j,i] == False and j < ilat: 
                     ilat = j
-                if malonlat[j,i] == False and j > elat: 
+                if malonlat.mask[j,i] == False and j > elat: 
                     elat = j
     else:
-        if dimx != dimy:
-            for i in range(dimx):
-                if malonlat[i] == False and i < ilon: 
-                    ilon = i
-                if malonlat[i] == False and i > elon: 
-                    elon = i
-            for j in range(dimy):
-                if malonlat[j] == False and j < ilat: 
-                    ilat = j
-                if malonlat[j] == False and j > elat: 
-                    elat = i
-        else:
-            for i in range(dimx):
-                if malonlat[i] == False and i < ilon: 
-                    ilon = i
-                    ilat = i
-                if malonlat[i] == False and i > elon: 
-                    elon = i
-                    elat = i
+        for i in range(dimx):
+            if malon.mask[i] == False and i < ilon: 
+                ilon = i
+            if malon.mask[i] == False and i > elon: 
+                elon = i
+        for j in range(dimy):
+            if malat.mask[j] == False and j < ilat: 
+                ilat = j
+            if malat.mask[j] == False and j > elat: 
+                elat = j
 
     print 'ilon elon ilat elat:', ilon, elon, ilat, elat