Changeset 555 for CMIP6dreqbuild/trunk/src/framework/overviewTabs.py

Timestamp:

20/01/16 17:01:33 (5 years ago)

Author:

mjuckes

Message:

cleaning CMOR tables

File:

• CMIP6dreqbuild/trunk/src/framework/overviewTabs.py (modified) (3 diffs)

CMIP6dreqbuild/trunk/src/framework/overviewTabs.py

@@ -73 +73 @@
     fss = '%s-%s_%s_%s.html' % (m,m2,self.tiermax, self.pmax)
     oo = open( 'tabs03/%s' % fss, 'w' )
-    ttl = 'Date requested by %s from %s experiments' % (m,m2)
+    ttl = 'Date requested by %s from %s experiments (tier %s, priority %s' % (m,m2,self.tiermax,self.pmax)
     jsh = ''
-    bdy = '<p>All variables in one <a href="../data/tabs02/%s-%s_%s_%s.xlsx">Excel file</a></p>\n' % (m,m2,self.tiermax, self.pmax)
+    bdy = '<h1>%s</h1>\n' % ttl
+    bdy += '<p>All variables in one <a href="../data/tabs02/%s-%s_%s_%s.xlsx">Excel file</a></p>\n' % (m,m2,self.tiermax, self.pmax)
 
     bdy += '<table>\n'
+    bdy += '<tr><th>Experiment</th><th>Volume (and link to variable lists)</th></tr>\n'
     for i in self.cc[m].ee[m2]:
       x = self.cc[m].a[i.uid]*2.
@@ -148 +150 @@
               llh.append( '<a title="Excel variable list: %s" href="data/tabs02/%s">%s</a>' % (sm,fn,s) )
           except:
-            print 'Failed to compute element: %s,%s  %s' % (m,m2, str(self.cc[m].a[m2]) )
+            print ( 'Failed to compute element: %s,%s  %s' % (m,m2, str(self.cc[m].a[m2]) ) )
             raise
        else:
@@ -184 +186 @@
         assert x[0] == xs, 'ERROR.0088: consistency problem %s  %s %s %s' % (m,m2,x[0],xs)
         if m == 'FAFMIP' and m2 == 'DECK':
-          print 'FAFMIP [1]:: ',x[1].keys()
-          print 'FAFMIP [2]:: ',collector['_FAFMIP_DECK'].a.keys()
+          print ( 'FAFMIP [1]:: %s' % str(x[1].keys() ) )
+          print ( 'FAFMIP [2]:: %s' % str( collector['_FAFMIP_DECK'].a.keys() ) )
 
         if acc: