Changeset 864 in lmdz_wrf for trunk

Timestamp:

Jun 17, 2016, 7:33:43 PM (8 years ago)

Author:

lfita

Message:

Using dictionary in 'CFvar_DIAGvar'

File:

• trunk/tools/generic_tools.py (modified) (4 diffs)

trunk/tools/generic_tools.py

@@ -621 +621 @@
       'diagnostics.inf' (reference for diagnostics.py')
        [CFname], [moddiag], [varcombo]
-         [moddiag]: name of the diagnosted variable
+         [CFname]: CF name of the variable
+         [moddiag]: name of the diagnosted variable (for `diagnostic.py')
          [varcombo]: combnination of variables to be used to compute diagnostic
     CFvar_DIAGvar(varn)
       [varn]= CF name of the variable
     >>> CFvar_MODvar('pr')
-    [[' RAINC', 'RAINNC']]
+    {'RAINTOT': ['RAINC', 'RAINNC']}
     >>> CFvar_MODvar('hurs')
-    [[' psol', 't2m', 'q2m'], [' psfc', 't', 'q'], [' PSFC', 'T2', 'Q2']]
+    {'TSrhs': ['psfc', 't', 'q'], 'LMDZrhs': ['psol', 't2m', 'q2m'], 'WRFrhs': ['PSFC', 'T2', 'Q2']}
     """
     import subprocess as sub
@@ -642 +643 @@
 
     infile = folder + '/diagnostics.inf'
-
     if not os.path.isfile(infile):
         print errormsg
@@ -650 +650 @@
     ncf = open(infile, 'r')
 
-    MODvars = []
+    MODvars = {}
     for line in ncf:
         if line[0:1] != '#':
             values = line.replace('\n','').replace(' ','').split(',')
-            if values[0] == varn: MODvars.append(values[2].split('@'))
+            if values[0] == varn: MODvars[values[1]] = values[2].split('@')
 
     if len(MODvars) == 0:
@@ -662 +662 @@
         return None
     else:
+        ncf.close()
         return MODvars