Changeset 1069 in lmdz_wrf for trunk/tools

Timestamp:

Aug 31, 2016, 1:24:55 PM (8 years ago)

Author:

lfita

Message:

First version of 'pinterp' model differences working!
Inclusion of empty dictionarys if there are not 'PLOTDIFF[OP/VAR]' differences

File:

• trunk/tools/model_graphics.py (modified) (7 diffs)

trunk/tools/model_graphics.py

@@ -1398 +1398 @@
     dirplot = gen.get_specdictionary_HMT(config, H=pkind+'_')
 
+    # No plots because there are not plots of this kind
+    if dirplot is None: 
+        print warnmsg
+        print '  ' + fname + ": no plots for type '" + pkind + "' !!"
+        return {}, 0
+
     if debug:
         print "  '" + pkind + "' plots to draw ________"
@@ -1435 +1441 @@
             values = line.replace('\\n','').split(' ')
             if values[0] == 'plots:':
-                plots = gen.stringList_dictKeysVals(values[1],cV=':')
+                if values[1] != 'none':
+                    plots = gen.stringList_dictKeysVals(values[1],cV=':')
+                else:
+                    pots = {}
             elif values[0] == 'itotp:':
                 Nplots = int(values[1])
@@ -1987 +1996 @@
 
     if debug:
-        print "  'op' differences ________"
-        gen.printing_dictionary(diffop)
-        print "  'var' differences ________"
-        gen.printing_dictionary(diffvar)
+        if diffop is not None:
+            print "  'op' differences ________"
+            gen.printing_dictionary(diffop)
+        if diffvar is not None:
+            print "  'var' differences ________"
+            gen.printing_dictionary(diffvar)
 
     # Getting variable characteristics from each model/experiment
@@ -2006 +2017 @@
     files2, testfiles2, allcompvar2, Nvar2= read_varcomp_file(idir2 + '/' + fvc2)
 
-    # Getting 'op' differences characteristics
-    doops, opvar, indivopvar, varglobalp = get_differences_var(diffop, 'op', debug)
-
     diffops = {}
-    Ndiffop = 0
-    for vn in opvar.keys():
-        vnops = opvar[vn]
-        for op in vnops:
-            vnop = vn + '_' + op
-            if not allcompvar1.has_key(vnop):
-                print warnmsg
-                print '  ' + fname + ": DIFFOP variable+operation '" + vnop +        \
-                  "' in '" + mods[0] + '/' + exps[0] + "' was not computed !!"
-                print '    skipping it!'
-                break
-            if not allcompvar2.has_key(vnop):
-                print warnmsg
-                print '  ' + fname + ": DIFFOP variable+operation '" + vnop +        \
-                  "' in '" + mods[1] + '/' + exps[1] + "' was not computed !!"
-                print '    skipping it!'
-                break
-            vals1 = allcompvar1[vnop]
-            vals2 = allcompvar2[vnop]
-
-            headerf1 = vals1[0]
-            headerf2 = vals2[0]
-
-            diffops[vnop] = [mods[0], mods[1], exps[0], exps[1], headerf1, headerf2]
-
-            Ndiffop = Ndiffop + 1        
-
-    # Getting 'var' differences characteristics
-    doops, opvar, indivopvar, varglobalp = get_differences_var(diffvar, 'var', debug)
+    if diffop is not None:
+        # Getting 'op' differences characteristics
+        doops, opvar, indivopvar, varglobalp = get_differences_var(diffop,'op',debug)
+
+        Ndiffop = 0
+        for vn in opvar.keys():
+            vnops = opvar[vn]
+            for op in vnops:
+                vnop = vn + '_' + op
+                if not allcompvar1.has_key(vnop):
+                    print warnmsg
+                    print '  ' + fname + ": DIFFOP variable+operation '" + vnop +    \
+                      "' in '" + mods[0] + '/' + exps[0] + "' was not computed !!"
+                    print '    skipping it!'
+                    break
+                if not allcompvar2.has_key(vnop):
+                    print warnmsg
+                    print '  ' + fname + ": DIFFOP variable+operation '" + vnop +    \
+                      "' in '" + mods[1] + '/' + exps[1] + "' was not computed !!"
+                    print '    skipping it!'
+                    break
+                vals1 = allcompvar1[vnop]
+                vals2 = allcompvar2[vnop]
+
+                headerf1 = vals1[0]
+                headerf2 = vals2[0]
+
+                diffops[vnop] = [mods[0],mods[1],exps[0],exps[1],headerf1,headerf2]
+
+                Ndiffop = Ndiffop + 1        
+    else:
+        Ndiffop = 0
 
     diffvars = {}
-    Ndiffvar = 0
-    for vn in opvar.keys():
-        vnops = opvar[vn]
-        for op in vnops:
-            vnop = vn + '_' + op
-            if not allcompvar1.has_key(vnop):
-                print warnmsg
-                print '  ' + fname + ": DIFFVAR variable+operation '" + vnop +       \
-                  "' in '" + mods[0] + '/' + exps[0] + "' was not computed !!"
-                print '    skipping it!'
-                break
-            if not allcompvar2.has_key(vnop):
-                print warnmsg
-                print '  ' + fname + ": DIFFVAR variable+operation '" + vnop +       \
-                  "' in '" + mods[1] + '/' + exps[1] + "' was not computed !!"
-                print '    skipping it!'
-                break
-            vals1 = allcompvar1[vnop]
-            vals2 = allcompvar2[vnop]
-
-            headerf1 = vals1[0]
-            headerf2 = vals2[0]
-
-            diffvars[vnop] = [mods[0], mods[1], exps[0], exps[1], headerf1, headerf2]
-
-            Ndiffvar = Ndiffvar + 1        
-
-    Sopdiffs = gen.dictKeysVals_stringList(diffops)
-    Svardiffs = gen.dictKeysVals_stringList(diffvars)
-
-    # Outwritting the op diffferences file to avoid next time (if it is not filescratch!)
+    if diffvar is not None:
+        # Getting 'var' differences characteristics
+        doops,opvar,indivopvar,varglobalp = get_differences_var(diffvar,'var',debug)
+
+        Ndiffvar = 0
+        for vn in opvar.keys():
+            vnops = opvar[vn]
+            for op in vnops:
+                vnop = vn + '_' + op
+                if not allcompvar1.has_key(vnop):
+                    print warnmsg
+                    print '  ' + fname + ": DIFFVAR variable+operation '" + vnop +   \
+                      "' in '" + mods[0] + '/' + exps[0] + "' was not computed !!"
+                    print '    skipping it!'
+                    break
+                if not allcompvar2.has_key(vnop):
+                    print warnmsg
+                    print '  ' + fname + ": DIFFVAR variable+operation '" + vnop +   \
+                      "' in '" + mods[1] + '/' + exps[1] + "' was not computed !!"
+                    print '    skipping it!'
+                    break
+                vals1 = allcompvar1[vnop]
+                vals2 = allcompvar2[vnop]
+    
+                headerf1 = vals1[0]
+                headerf2 = vals2[0]
+
+                diffvars[vnop] = [mods[0],mods[1],exps[0],exps[1],headerf1,headerf2]
+
+                Ndiffvar = Ndiffvar + 1
+    else:
+        Ndiffvar = 0
+
+    if diffop is not None:
+        Sopdiffs = gen.dictKeysVals_stringList(diffops)
+    else:
+        Sopdiffs = 'none'
+    # Outwritting the op diffferences file to avoid next time
     objf = open(odir + '/diffop.inf', 'w')
     objf.write('differences: ' + Sopdiffs + '\n')
@@ -2077 +2095 @@
     objf.close() 
 
-    # Outwritting the var diffferences file to avoid next time (if it is not filescratch!)
+    if diffvar is not None:
+        Svardiffs = gen.dictKeysVals_stringList(diffvars)
+    else:
+        Svardiffs = 'none'
+    # Outwritting the var diffferences file to avoid next time
     objf = open(odir + '/diffvar.inf', 'w')
     objf.write('differences: ' + Svardiffs + '\n')
@@ -2083 +2105 @@
     objf.close() 
 
-    return diffops, diffvars, Ndiffvar, Ndiffop
+    return diffops, diffvars, Ndiffop, Ndiffvar
 
 def read_diff_file(difffile):
@@ -3074 +3096 @@
         # Re-projecting also the 'original' (at least with 'pinterp') file for varsdif
         if op.find('pinterp') != -1:
-            ifileorig = vn +'_'+ values[0].replace('reproj-','') + '_pinterp.nc'
-            ofileorig = vn +'_'+ values[0] + '_pinterp.nc'
-            ofilen = vn +'_'+ values[0] + '_pinterp.nc'
+            ifileorig = vn +'_'+ values[0].replace('reproj-','') + 'p_pinterp.nc'
+            ofileorig = vn +'_'+ values[0] + 'p_pinterp.nc'
+            ofilen = vn +'_'+ values[0] + 'p_pinterp.nc'
         else:
             ifileorig = vn +'_'+ values[0].replace('reproj-','') + '.nc'