Changeset 1066 in lmdz_wrf for trunk

Timestamp:

Aug 30, 2016, 6:49:41 PM (9 years ago)

Author:

lfita

Message:

Fixing diagnostics variable retrievals for multiple possibilities (different models)

Location:

trunk/tools

Files:

• generic_tools.py (modified) (2 diffs)
• nc_var_tools.py (modified) (2 diffs)

trunk/tools/generic_tools.py

@@ -666 +666 @@
     >>> CFvar_DIAGvar('hurs')
     {'TSrhs': ['psfc', 't', 'q'], 'LMDZrhs': ['psol', 't2m', 'q2m'], 'WRFrhs': ['PSFC', 'T2', 'Q2']}
+    >>> CFvar_DIAGvar('wss')
+    {'wss': [['U10', 'V10'], ['u10m', 'v10m']]}
     """
     import subprocess as sub
@@ -687 +689 @@
 
     MODvars = {}
+    MODdiags = []
     for line in ncf:
         if line[0:1] != '#':
             values = line.replace('\n','').replace(' ','').split(',')
-            if values[0] == varn: MODvars[values[1]] = values[2].split('@')
+            if values[0] == varn: 
+                MODdiags.append(values[2].split('@'))
+
+    MODvars[varn] = MODdiags
 
     if len(MODvars) == 0:

trunk/tools/nc_var_tools.py

@@ -15998 +15998 @@
     modelvars = gen.CFvar_MODvar(varname)
     diagvars = gen.CFvar_DIAGvar(varname)
+    print fname + '; Lluis varname:', varname,' diagvars:', diagvars
 
     computevarmod = []
@@ -16008 +16009 @@
     if diagvars is not None:
         for diagn in diagvars.keys():
-            combovar = diagvars[diagn]
-            alltrue = False
-            if len(combovar) > 1:
-                for cvar in combovar: 
-                    if gen.searchInlist(NOchk,cvar):
-                        alltrue = True
-                    else:
-                        if gen.searchInlist(ncvars,cvar): alltrue = True
-            else:
-                if gen.searchInlist(ncvars,combovar[0]): alltrue = True
-
-            if alltrue: computevardiag.append([diagn] + combovar)
+            combovars = diagvars[diagn]
+            for combovar in combovars:
+                alltrue = False
+                if type(combovar) == type([1,2]):
+                    for cvar in combovar: 
+                        if gen.searchInlist(NOchk,cvar):
+                            alltrue = True
+                        elif gen.searchInlist(ncvars,cvar): 
+                            alltrue = True
+                        else:
+                            alltrue = False
+                else:
+                    if gen.searchInlist(ncvars,combovar): alltrue = True
+
+                if alltrue: 
+                    computevardiag.append([diagn] + combovar)
+                    break
 
     if len(computevardiag) < 1: computevardiag = None