Changeset 1111 in lmdz_wrf

Timestamp:

Sep 22, 2016, 2:33:19 PM (9 years ago)

Author:

lfita

Message:

Adding the required combinations to get the desired one as accessible combinations in dictionary 'varcomp'

File:

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

trunk/tools/model_graphics.py ¶

@@ -689 +689 @@
                     diag = Vvals[4].split(':')
 
-                allvarcomp[Vvals[0]+'_'+Vvals[1]] = [Vvals[2], mod, diag, Vvals[5]]
+                # To get a combination of operations, all the precedent steps are kept
+                #   thus, they are also available !
+                seqops = Vvals[1].split('+')
+                for seqop in seqops:
+                    if seqop == seqops[0]: seqopS=seqop
+                    else: seqopS = seqopS + '+' + seqop 
+                    allvarcomp[Vvals[0]+'_'+seqopS] = [Vvals[2], mod, diag, Vvals[5]]
         elif vals[0] == 'itotv:':
             ivop = int(vals[1])
@@ -1819 +1825 @@
                 quit(-1)
 
-            figtit = '|'.join(tfig.split('!')[0:2]) + '|' + figmid + '|' +           \
-              '|'.join(tfig.split('!')[2:])
+            figtit = '!'.join(tfig.split('!')[0:2]) + '!' + figmid + '!' +           \
+              '!'.join(tfig.split('!')[2:])
 
             graphvals = spacedim + ':' + Arange + ':' + Brange + ':Extrs:' +         \
@@ -1975 +1981 @@
                 quit(-1)
 
-            figtit = '|'.join(tfig.split('!')[0:2]) + '|' + figmid + '|' +           \
-              '|'.join(tfig.split('!')[2:])
+            figtit = '!'.join(tfig.split('!')[0:2]) + '!' + figmid + '!' +           \
+              '!'.join(tfig.split('!')[2:])
+            figtit = figtit.replace('!',' ')
             leglabels = ','.join(lablines)
 
@@ -2047 +2054 @@
             figmid = 'evolution'
 
-            figtit = '|'.join(tfig.split('!')[0:2]) + '|' + figmid + '|' +           \
-              '|'.join(tfig.split('!')[2:])
+            figtit = '!'.join(tfig.split('!')[0:2]) + '!' + figmid + '!' +           \
+              '!'.join(tfig.split('!')[2:])
+            figtit = figtit.replace('!',' ')
             leglabels = ','.join(lablines)
 
@@ -2666 +2674 @@
                       "' in '" + mods[0] + '/' + exps[0] + "' was not computed !!"
                     print '    skipping it!'
+                    print '    variables computed:', allcompvar1
                     break
                 if not allcompvar2.has_key(vnop):
@@ -2672 +2681 @@
                       "' in '" + mods[1] + '/' + exps[1] + "' was not computed !!"
                     print '    skipping it!'
+                    print '    variables computed:', allcompvar2
                     break
                 vals1 = allcompvar1[vnop]
@@ -2700 +2710 @@
                       "' in '" + mods[0] + '/' + exps[0] + "' was not computed !!"
                     print '    skipping it!'
+                    print '    variables computed:', allcompvar1
                     break
                 if not allcompvar2.has_key(vnop):
@@ -2706 +2717 @@
                       "' in '" + mods[1] + '/' + exps[1] + "' was not computed !!"
                     print '    skipping it!'
+                    print '    variables computed:', allcompvar2
                     break
                 vals1 = allcompvar1[vnop]
@@ -2759 +2771 @@
                 if values[1] != 'none':
                     diffs = gen.stringList_dictKeysVals(values[1])
+                    print fname + '; Lluis', difffile, ' diffs:', diffs
+                    quit()
                 else:
                     diffs = {} 
@@ -4165 +4179 @@
 
             # Title of figure
-            titfigure = 'all model-experiments ' + vn + optitle(op,opexplained)
+            titfigure = 'all!model-experiments!' + vn + optitle(op,opexplained)
 
             draw_plot(kplot, CFvarsplot, filesplot, varsplot, dimsplot, pictplot,    \
@@ -4297 +4311 @@
         varcompf = owdir + '/varcompute.inf'
         if addfiles:
+            if dbg:
+                print '  ' + main + ": adding variables to copmute removing " +      \
+                  "file '" + varcompf + "' ..."
             sub.call('rm ' + varcompf +' >& /dev/null', shell=True)
 
@@ -4358 +4375 @@
 
         if addfigures:
+            if dbg:
+                print '  ' + main + ": adding direct figures removing file '" +      \
+                  dirfigf + "' ..."
             sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
 
@@ -4426 +4446 @@
 
                 if adddiffs:
+                    if dbg:
+                        print '  ' + main + ": adding differences removing file '" + \
+                          difff + "' ..."
                     sub.call('rm ' + difff +' >& /dev/null', shell=True)
 
@@ -4469 +4492 @@
 
         if adddifffigures:
+            if dbg:
+                print '  ' + main + ": adding differences' figures removing file '" +\
+                  dirfigf + "' ..."
+
             sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
 
@@ -4503 +4530 @@
 
         if adddifffigures:
+            if dbg:
+                print '  ' + main + ": adding differences' figures removing file '" +\
+                  dirfigf + "' ..."
             sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
 
@@ -4678 +4708 @@
 
                     if addmoddiffs:
+                        if dbg:
+                            print '  ' + main + ": adding model differences " +      \
+                              "removing file '" + difff + "' ..."
                         sub.call('rm ' + difff +' >& /dev/null', shell=True)
 
@@ -4724 +4757 @@
 
                 if addmoddifffigures:
+                    if dbg:
+                        print '  ' + main + ": adding model differences' figures " + \
+                          "removing file '" + dirfigf + "' ..."
                     sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
 
@@ -4758 +4794 @@
         
                 if adddifffigures:
+                    if dbg:
+                        print '  ' + main + ": adding differences's figures " +      \
+                          "removing file '" + dirfigf + "' ..."
                     sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
 
@@ -4818 +4857 @@
         
 if addallmodexpfigures:
+    if dbg:
+        print '  ' + main + ": adding model-experiment differences removing " +      \
+          " file '" + allfigf + "' ..."
+        print '  ' + main + ": adding model-experiment differences' figures " +      \
+          "removing file '" + dirfigf + "' ..."
     sout = sub.call('rm ' + allfigf + ' >& /dev/null', shell=True)
     sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)