Changeset 756 in lmdz_wrf

Timestamp:

May 4, 2016, 12:32:37 PM (9 years ago)

Author:

lfita

Message:

Adding `generic_tools'

File:

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

trunk/tools/diagnostics.py

@@ -12 +12 @@
 import re
 import nc_var_tools as ncvar
+import generic_tools as gen
 import datetime as dtime
 
@@ -872 +873 @@
     else:
         depvars = diags[idiag].split('|')[1].split('@')
-        if ncvar.searchInlist(depvars, 'WRFgeop'): WRFgeop_compute = True
-        if ncvar.searchInlist(depvars, 'WRFp'): WRFp_compute = True
-        if ncvar.searchInlist(depvars, 'WRFt'): WRFt_compute = True
-        if ncvar.searchInlist(depvars, 'WRFrh'): WRFrh_compute = True
-        if ncvar.searchInlist(depvars, 'WRFght'): WRFght_compute = True
-        if ncvar.searchInlist(depvars, 'WRFdens'): WRFdens_compute = True
-        if ncvar.searchInlist(depvars, 'WRFpos'): WRFpos_compute = True
-        if ncvar.searchInlist(depvars, 'WRFtime'): WRFtime_compute = True
+        if gen.searchInlist(depvars, 'WRFgeop'): WRFgeop_compute = True
+        if gen.searchInlist(depvars, 'WRFp'): WRFp_compute = True
+        if gen.searchInlist(depvars, 'WRFt'): WRFt_compute = True
+        if gen.searchInlist(depvars, 'WRFrh'): WRFrh_compute = True
+        if gen.searchInlist(depvars, 'WRFght'): WRFght_compute = True
+        if gen.searchInlist(depvars, 'WRFdens'): WRFdens_compute = True
+        if gen.searchInlist(depvars, 'WRFpos'): WRFpos_compute = True
+        if gen.searchInlist(depvars, 'WRFtime'): WRFtime_compute = True
 
 if WRFgeop_compute:
@@ -1013 +1014 @@
         for depv in depvars:
             if not ncobj.variables.has_key(depv) and not                             \
-              ncvar.searchInlist(NONcheckingvars, depv) and                          \
-              not ncvar.searchInlist(methods, depv):
+              gen.searchInlist(NONcheckingvars, depv) and                            \
+              not gen.searchInlist(methods, depv):
                 print errormsg
                 print '  ' + main + ": file '" + opts.ncfile +                       \
@@ -1022 +1023 @@
         depvars = diags[idiag].split('|')[1]
         if not ncobj.variables.has_key(depvars) and not                              \
-          ncvar.searchInlist(NONcheckingvars, depvars) and                           \
-          not ncvar.searchInlist(methods, depvars):
-            print errormsg, 'Lluis',methods
+          gen.searchInlist(NONcheckingvars, depvars) and                             \
+          not gen.searchInlist(methods, depvars):
+            print errormsg
             print '  ' + main + ": file '" + opts.ncfile +                           \
               "' does not have variable '" + depvars + "' !!"