Changeset 1068 in lmdz_wrf

Timestamp:

Aug 31, 2016, 1:12:33 PM (9 years ago)

Author:

lfita

Message:

Fixing multiple possible diagnostics for the same CF variable (different models)

Location:

trunk/tools

Files:

• generic_tools.py (modified) (1 diff)
• nc_var_tools.py (modified) (4 diffs)

trunk/tools/generic_tools.py

@@ -689 +689 @@
 
     MODvars = {}
-    MODdiags = []
     for line in ncf:
         if line[0:1] != '#':
             values = line.replace('\n','').replace(' ','').split(',')
             if values[0] == varn: 
-                MODdiags.append(values[2].split('@'))
-
-    MODvars[varn] = MODdiags
+                MODdiags = values[2].split('@')
+                if MODvars.has_key(values[1]):
+                    oldvals = MODvars[values[1]]
+                    oldvals = [oldvals, MODdiags]
+                    MODvars[values[1]] = oldvals
+                else:
+                    MODvars[values[1]] = 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 = []
@@ -16010 +16009 @@
         for diagn in diagvars.keys():
             combovars = diagvars[diagn]
-            for combovar in combovars:
+            # Checking if there is more than one possible combination
+            if type(combovars[0]) == type([1,2]):
+                for combovs in combovars:
+                  alltrue = False
+                  if type(combovs) == type([1,2]):
+                      for cvar in combovs: 
+                          if gen.searchInlist(NOchk,cvar):
+                              alltrue = True
+                          elif gen.searchInlist(ncvars,cvar): 
+                              alltrue = True
+                          else:
+                              alltrue = False
+                  else:
+                      if gen.searchInlist(ncvars,combovs): alltrue = True
+
+                  if alltrue: 
+                      computevardiag.append([diagn] + combovs)
+                      break
+            else:
+                combovar = combovars
                 alltrue = False
                 if type(combovar) == type([1,2]):
@@ -16026 +16044 @@
                     computevardiag.append([diagn] + combovar)
                     break
+            if alltrue: break
 
     if len(computevardiag) < 1: computevardiag = None
@@ -16033 +16052 @@
 def computevar_model(values, ncfile):
     """ Function to provide the way to compute a CF-variable providing its name
-      varname= CF-compilant variable name
+      values= CF-compilant variable name
       ncfile= netCDF file from which the variable should be retrieved
     """