Changeset 376 in lmdz_wrf for trunk

Timestamp:

Mar 20, 2015, 12:01:52 PM (10 years ago)

Author:

lfita

Message:

Adding in 'variables_values' a non-checking for statistics for that variables with a name which contents a statistics section
Fixing minor issues in the 'variables_values' file

Location:

trunk/tools

Files:

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

trunk/tools/drawing_tools.py

@@ -736 +736 @@
     stats=['min','max','mean','stdv', 'sum']
 
+# Variables with a statistical section on their name...
+    NOstatsvars = ['zmaxth', 'zmax_th', 'lmax_th', 'lmaxth']
+
     ifst = False
-    for st in stats:
-        if varName.find(st) > -1:
-            print '    '+ fname + ": varibale '" + varName + "' with a statistical "+\
-              " surname: '",st,"' !!"
-            Lst = len(st)
-            LvarName = len(varName)
-            varn = varName[0:LvarName - Lst]
-            ifst = True
-            break
+    if not searchInlist(NOstatsvars, varName.lower()):
+        for st in stats:
+            if varName.find(st) > -1:
+                print '    '+ fname + ": varibale '" + varName + "' with a " +       \
+                  "statistical surname: '",st,"' !!"
+                Lst = len(st)
+                LvarName = len(varName)
+                varn = varName[0:LvarName - Lst]
+                ifst = True
+                break
     if not ifst:
         varn = varName
@@ -3814 +3818 @@
                 if y.shape[0] == dimyv.shape[0]:
                     for i in range(y.shape[1]):
-                        y[:,i] = dimyv
+                        y[i,:] = dimyv
                 else:
                     for i in range(y.shape[0]):
-                        y[i,:] = dimyv
+                        y[:,i] = dimyv
 
 #    plt.rc('text', usetex=True)

trunk/tools/variables_values.dat

@@ -48 +48 @@
 LCLDH, clh, high_level_cloud_area_fraction, 0., 1., high|level|(p|<|440|hPa)|cloud|fraction, 1, gist_gray
 High-level cloudiness, clh, high_level_cloud_area_fraction, 0., 1., high|level|(p|<|440|hPa)|cloud|fraction, 1, gist_gray
-clmf, clmf, cloud_base_max_flux, -0.3, 0.3, cloud|base|max|flux, kgm-2s-1, seismic
-fbase, clmf, cloud_base_max_flux, -0.3, 0.3, cloud|base|max|flux, kgm-2s-1, seismic
-LFBASE, clmf, cloud_base_max_flux, -0.3, 0.3, cloud|base|max|flux, kgm-2s-1, seismic
+clmf, clmf, cloud_base_mass_flux, -0.3, 0.3, cloud|base|mass|flux, kgm-2s-1, seismic
+fbase, clmf, cloud_base_mass_flux, -0.3, 0.3, cloud|base|mass|flux, kgm-2s-1, seismic
+LFBASE, clmf, cloud_base_mass_flux, -0.3, 0.3, cloud|base|mass|flux, kgm-2s-1, seismic
 clp, clp, cloud_base_pressure, -0.3, 0.3, cloud|base|pressure, Pa, Reds
 pbase, clp, cloud_base_pressure, -0.3, 0.3, cloud|base|pressure, Pa, Reds