Changeset 1082 in lmdz_wrf for trunk

Timestamp:

Sep 4, 2016, 10:13:44 PM (9 years ago)

Author:

lfita

Message:

Getting more there for the all model-experiments figures

File:

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

trunk/tools/model_graphics.py

@@ -28 +28 @@
     # List with the mandatory keys
     mandatorykeys = ['pyHOME', 'cdoHOME', 'scratch', 'filescratch', 'figscratch',    \
-      'diffscratch', 'figdiffscratch', 'addfiles', 'addfigures', 'adddiffs',         \
-      'adddifffigures', 'debug', 'models', 'ifold', 'ofold', 'warnmsg', 'errmsg',    \
-      'titleoperations', 'kindfig', 'CFreftime', 'CFunitstime', 'mapval',            \
-      'timekind', 'timefmt', 'timelabel' ]
+      'diffscratch', 'figdiffscratch', 'figallmodexpscratch', 'addfiles',            \
+      'addfigures', 'adddiffs', 'adddifffigures', 'addallmodexpfigures', 'debug',    \
+      'models', 'ifold', 'ofold', 'warnmsg', 'errmsg', 'titleoperations', 'kindfig', \
+      'CFreftime', 'CFunitstime', 'mapval', 'timekind', 'timefmt', 'timelabel' ]
 
     # List with the optional keys
@@ -234 +234 @@
             addmoddifffigs = False
 
-        if config['addmodexpfigures'] == 'true':
-            addmodexpfigs = True
+        if config['addallmodexpfigures'] == 'true':
+            addallmodexpfigs = True
         else:
-            addmodexpfigs = False
+            addallmodexpfigs = False
 
     if config['debug'] == 'true':
@@ -246 +246 @@
     return scr, filescr, figscr, difscr, figdifscr, moddifscr, figmoddifscr,         \
       figallmodexpscr, addfils, addfigs, adddiffs, adddifffigs, addmoddiffs,         \
-      addmoddifffigs, addmodexpfigs, debug
+      addmoddifffigs, addallmodexpfigs, debug
 
 def exp_headers(mod,config):
@@ -3474 +3474 @@
     return
 
-def allmodexps_listconstruct(config, modexps, reprj, odir, debug):
+def allmodexps_listconstruct(config, modexps, odir, debug):
     """ Function to create the list of all model-experiments to draw
       config= Configuration of the experiment
       modexps= list with the models-experiments pairs to use
-      reprj= list with whether re-rpojection needs to be done
       odir= output differences folder
     """
@@ -3493 +3492 @@
     ModComProj = cnf['RefProj'].split(':')
 
+    allmodexp = {}
+    Nallmodexp = 0
     for modexp in modexps:
+        if debug:
+            print "    " +  fname + ": '" + modexp + "' ..."
         mod = modexp.split('/')[0]
         exp = modexp.split('/')[1]
@@ -3502 +3505 @@
         reproj = not gen.searchInlist(ModComProj,mod)
 
-        fvarcomp = 'varcompuet.inf'
+        fvarcomp = 'varcompute.inf'
         if reproj: fvc = 'reproj_' + fvarcomp
         else: fvc = fvarcomp
@@ -3508 +3511 @@
         files, testfiles, allcompvar, Nvar= read_varcomp_file(idir + '/' + fvc)
 
-        allmodexp = {}
         if allplts is not None:
             # Getting all model-experiments plots characteristics
 
-            Nallmodexp = 0
             for allplt in allplts.keys():
+                pltn = allplt.split('_')[1]
+                if debug and modexp == modexps[0]:
+                    print '    ' + fname + ":      plot '" + pltn + "' "
                 varops = allplts[allplt].split(':')
-                for vnop in varops:
+                for varop in varops:
                     vn = varop.split('|')[0]
                     op = varop.split('|')[1]
+                    vnop = vn + '_' + op
+                    if debug and modexp == modexps[0]:
+                        print '    ' + fname + ":        varop '" + vnop + "' "
                     if not allcompvar.has_key(vnop):
                         print warnmsg
@@ -3523 +3530 @@
                           "' in '" + modexp + "' was not computed !!"
                         print '    skipping it!'
+                        print '    computed values:', allcompvar.keys()
                         break
 
@@ -3530 +3538 @@
                     if modexp == modexps[0]:
                         allmodexp[vnop] = [modexp,headerf]
+                        Nallmodexp = Nallmodexp + 1
                     else:
                         prevals = allmodexp[vnop]
@@ -3535 +3544 @@
                         allmodexp[vnop] = prevals
 
-                Nallmodexp = Nallmodexp + 1
         else:
             Nallmodexp = 0
@@ -3774 +3782 @@
 scratch, filescratch, figscratch, diffscratch, figdiffscratch, moddiffscratch,       \
   figmoddiffscratch, figallmodexpscratch, addfiles, addfigures, adddiffs,            \
-  adddifffigures, addmoddiffs, addmoddifffigures, addallmodexfigures, pdbg =         \
+  adddifffigures, addmoddiffs, addmoddifffigures, addallmodexpfigures, dbg =         \
   scratches(cnf)
 
@@ -4373 +4381 @@
 dirfigf = owdir + '/allmodexpfigures.inf'
 allfigf = owdir+'/all_figures.inf'
-if allmodexpfigscratch:
+if figallmodexpscratch:
     sout = sub.call('rm ' + allf + ' >& /dev/null', shell=True)
     sout = sub.call('rm ' + dirfigf + ' >& /dev/null', shell=True)
@@ -4402 +4410 @@
 if not os.path.isfile(allf):
     # Constructing the information of modexp / variable
-    allmodexpvar, Nallmodexpvar = allmodexps_listconstruct(config, modexps, , odir, debug)
+    allmodexpvar, Nallmodexpvar = allmodexps_listconstruct(cnf, allmodexps, owdir, dbg)
 else:
     allmodexpvar, Nallmodexpvar = allmodexps_read(allf)
 
-draw_allmodexp_plots(cnf, listplots, owdir, allmodexpvar, 'diffvar', allmodexpfigscratch, dbg)
-
+#draw_allmodexp_plots(cnf, listplots, owdir, allmodexpvar, 'diffvar', figallmodexpscratch, dbg)
+