Changeset 2739 in lmdz_wrf

Timestamp:

Oct 31, 2019, 2:06:45 PM (6 years ago)

Author:

lfita

Message:

Adding:

• masking of values in `draw_2D_shad' if variable has 'missing_value' attribute
• modify 'graphic_range' to compute extremes as masked values
• Adding ' z0h' in variabels_values.dat

Location:

trunk/tools

Files:

• drawing.py (modified) (1 diff)
• drawing_tools.py (modified) (5 diffs)
• variables_values.dat (modified) (1 diff)

trunk/tools/drawing.py

@@ -263 +263 @@
 
     valshad, dimsshad = drw.slice_variable(objvars, dimvals.replace(',','|'))
+    # Masking if exists 'missing_value' attribute
+    if gen.searchInlist(objvars.ncattrs(), 'missing_value'):
+        missval = objvars.missing_value
+        print infmsg
+        valshad = ma.masked_equal(valshad,missval)
+        valshad = ma.masked_greater(valshad,0.95*missval)
+        print '    ' + fname + ": masking by 'missing_value':", missval, " !!"
+        print '        masked', np.sum(valshad.mask), 'values'
 
 # Dimensions names

trunk/tools/drawing_tools.py

@@ -2801 +2801 @@
     if type(vrng[0]) == type('S') and vrng[0][0:1] == 'S':
         if vrng[0] == 'Srange':
-            rangegrph[0] = np.min(varsV)
-            rangegrph[1] = np.max(varsV)
+            rangegrph[0] = varsV.min()
+            rangegrph[1] = varsV.max()
         elif vrng[0][0:11] == 'Saroundzero':
-            minv = np.min(varsV)
-            maxv = np.max(varsV)
+            minv = varsV.min()
+            maxv = varsV.max()
             minextrm = np.max([np.abs(minv), np.abs(maxv)])
             rangegrph[0] = -minextrm
             rangegrph[1] = minextrm
         elif vrng[0][0:11] == 'Saroundmean':
-            meanv = np.mean(varsV)
+            meanv = varsV.mean()
             permean = np.float(vrng[0].split('@')[1])
-            minv = np.min(varsV)*permean
-            maxv = np.max(varsV)*permean
+            minv = varsV.min()*permean
+            maxv = varsV.max()*permean
             minextrm = np.min([np.abs(meanv-minv), np.abs(maxv-meanv)])
             rangegrph[0] = meanv-minextrm
@@ -2819 +2819 @@
         elif vrng[0][0:13] == 'Saroundminmax':
             permean = np.float(vrng[0].split('@')[1])
-            minv = np.min(varsV)*permean
-            maxv = np.max(varsV)*permean
+            minv = varsV.min()*permean
+            maxv = varsV.max()*permean
             rangegrph[0] = minv
             rangegrph[1] = maxv
         elif vrng[0][0:17] == 'Saroundpercentile':
-            medianv = np.median(varsV)
+            medianv = varsV.median()
             valper = np.float(vrng[0].split('@')[1])
             minv = np.percentile(varsV, valper)
@@ -2832 +2832 @@
             rangegrph[1] = medianv+minextrm
         elif vrng[0][0:5] == 'Smean':
-            meanv = np.mean(varsV)
+            meanv = varsV.mean()
             permean = np.float(vrng[0].split('@')[1])
-            minv = np.min(varsV)*permean
-            maxv = np.max(varsV)*permean
+            minv = varsV.min()*permean
+            maxv = varsV.max()*permean
             minextrm = np.min([np.abs(meanv-minv), np.abs(maxv-meanv)])
             rangegrph[0] = -minextrm
             rangegrph[1] = minextrm
         elif vrng[0][0:7] == 'Smedian':
-            medianv = np.median(varsV)
+            medianv = varsV.median()
             permedian = np.float(vrng[0].split('@')[1])
-            minv = np.min(varsV)*permedian
-            maxv = np.max(varsV)*permedian
+            minv = varsV.min()*permedian
+            maxv = varsV.max()*permedian
             minextrm = np.min([np.abs(medianv-minv), np.abs(maxv-medianv)])
             rangegrph[0] = -minextrm
             rangegrph[1] = minextrm
         elif vrng[0][0:11] == 'Spercentile':
-            medianv = np.median(varsV)
+            medianv = varsV.median()
             valper = np.float(vrng[0].split('@')[1])
             minv = np.percentile(varsV, valper)
@@ -4632 +4632 @@
 
     plt.axis([x.min(), x.max(), y.min(), y.max()])
-    if reva[0:4] == 'flip':
+    if reva is not None and reva[0:4] == 'flip':
         axis = reva.split('@')[1]
         if axis == 'x':
@@ -14332 +14332 @@
           'c': center
           'vert',Nvert: at coordinates of vertex number Nvert
-          'overt',xoffset,yoffset: at coordinates of vertex number Nvert aplying an
+          'overt',Nvert,xoffset,yoffset: at coordinates of vertex number Nvert aplying an
             offset at each direction
       Nint: number of intermediate grid points to use in order to have lon, lat 

trunk/tools/variables_values.dat

@@ -883 +883 @@
 zg_per, zg_per, geopotential_height_per, 0., 80000., geopotential|height|perturbation, m2s-2, rainbow, $zg^{pert}$, zgpert
 PH, zg_per, geopotential_height_per, 0., 80000., geopotential|height|perturbation, m2s-2, rainbow, $zg^{pert}$, zgpert
+z0h, z0h, roughness_heat, 0., 2., roughness|length|for|heat, -, CMRmap_r, $z_{0}h$, z0h
 zeq, zeq, height_level_equilibrium, 0., 2000., height|of|level|equilibirum, m, BuPu, $zeq$, zeq
 Equilibrum Level, zeq, height_level_equilibrium, 0., 2000., height|of|level|equilibirum, m, BuPu, $zeq$, zeq