Changeset 464 in lmdz_wrf

Timestamp:

Jun 9, 2015, 5:08:32 PM (10 years ago)

Author:

lfita

Message:

Re-arranging the `None' vardim case for the simulation

File:

• trunk/tools/validation_sim.py (modified) (1 diff)

trunk/tools/validation_sim.py

@@ -1186 +1186 @@
 valdimsim = {}
 for dn in dims:
-    if dims[dn][0] != 'None' and not osim.dimensions.has_key(dims[dn][0]):
-        print errormsg
-        print '  ' + main + ": simulation file '" + opts.fsim + "' does not have " + \
-          "dimension '" + dims[dn][0] + "' !!"
-        print '    it has: ',osim.dimensions
-        quit(-1)
-
-    if vardims[dn][0] != 'None' and not osim.variables.has_key(vardims[dn][0]) and   \
-      not searchInlist(varNOcheck,vardims[dn][0]):
-        print errormsg
-        print '  ' + main + ": simulation file '" + opts.fsim + "' does not have " + \
-          "varibale dimension '" + vardims[dn][0] + "' !!"
-        print '    it has variables:',osim.variables
-        quit(-1)
-    if searchInlist(varNOcheck,vardims[dn][0]):
-        valdimsim[dn] = compute_varNOcheck(osim, vardims[dn][0])
-    else and vardims[dn][0] != 'None':
-        valdimsim[dn] = osim.variables[vardims[dn][0]][:]
+    if dims[dn][0] != 'None':
+        if not osim.dimensions.has_key(dims[dn][0]):
+            print errormsg
+            print '  ' + main + ": simulation file '" + opts.fsim +                  \
+              "' does not have dimension '" + dims[dn][0] + "' !!"
+            print '    it has: ',osim.dimensions
+            quit(-1)
+
+        if not osim.variables.has_key(vardims[dn][0]) and                            \
+          not searchInlist(varNOcheck,vardims[dn][0]):
+            print errormsg
+            print '  ' + main + ": simulation file '" + opts.fsim +                  \
+              "' does not have varibale dimension '" + vardims[dn][0] + "' !!"
+            print '    it has variables:',osim.variables
+            quit(-1)
+        if searchInlist(varNOcheck,vardims[dn][0]):
+            valdimsim[dn] = compute_varNOcheck(osim, vardims[dn][0])
+       else:
+            valdimsim[dn] = osim.variables[vardims[dn][0]][:]
 
 # General characteristics