Changeset 863 in lmdz_wrf

Timestamp:

Jun 17, 2016, 7:33:18 PM (9 years ago)

Author:

lfita

Message:

Using dictinoary in 'CFvar_DIAGvar'

File:

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

trunk/tools/nc_var_tools.py

@@ -12627 +12627 @@
     return
 
-#DataSetSection_multivars('XTIME,4380,4800,-1','/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00','all')
+#DataSetSection_multivars('XTIME,4380,4800,-1','/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00','T2')
 #DataSetSection_multivars('WRFt,20011111060000,20011111180000,-1','/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00','all')
+#quit()
 
 def get_attribute(values, filen, varn):
@@ -15106 +15107 @@
       varname= CF-compilant variable name
       onc= netCDF file object from which the variable should be retrieved
+      NOTE: on output 'computevardiag', first value of the list is the 'diagnostics.py' name
     >>> onc = NetCDFFile('/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00', 'r')
     >>> mod, diag = var_model('tas', onc)
     ['T2'], None
     >>> mod, diag = var_model('hurs', onc)
-    None, [['PSFC', 'T2', 'Q2']]
+    None, [['WRFrhs', 'PSFC', 'T2', 'Q2']]
     """
     fname = 'var_model'
@@ -15145 +15147 @@
     computevardiag = []
     if diagvars is not None:
-        for combovar in diagvars:
+        for diagn in diagvars.keys():
+            combovar = diagvars[diagn]
             alltrue = False
             if len(combovar) > 1:
@@ -15157 +15160 @@
                 if gen.searchInlist(ncvars,combovar[0]): alltrue = True
 
-            if alltrue: computevardiag.append(combovar)
+            if alltrue: computevardiag.append([diagn] + combovar)
 #    print '  ' + fname + ': Lluis; alltrue:', alltrue, 'computevardiag:', computevardiag
 
@@ -15163 +15166 @@
 
     return computevarmod, computevardiag
+#onc = NetCDFFile('/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00', 'r')
+#mod, diag = var_model('tas', onc)
+#print mod
+#print diag
+#mod, diag = var_model('hurs', onc)
+#print mod
+#print diag
 
 def computevar_model(values, ncfile):
@@ -15202 +15212 @@
     return varmod, vardiag
 
-#computevar_model('cll', '/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00')
+#computevar_model('pr', '/home/lluis/PY/wrfout_d01_2001-11-11_00:00:00')
 #quit()