Changeset 582

Timestamp:

02/02/16 15:01:04 (5 years ago)

Author:

mjuckes

Message:

makeTables ...

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• dreq.py (modified) (1 diff)
• makeTables.py (copied) (copied from CMIP6dreqbuild/trunk/src/framework/makeTables.py) (2 diffs)
• packageConfig.py (modified) (1 diff)
• scope.py (modified) (1 diff)

CMIP6dreqbuild/trunk/src/framework/dreqPy/dreq.py

@@ -307 +307 @@
              elif self._a[a].type == u'xs:boolean':
                v = v in ['true','1']
+             elif self._a[a].type == u'aa:st__stringList':
+               if v.find(' ') != -1:
+                 v = v.split()
+               else:
+                 v = [v,]
              elif self._a[a].type not in [u'xs:string']:
                print ('ERROR: Type %s not recognised' % self._a[a].type )

CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py

@@ -1 +1 @@
 
-from dreqPy import dreq
+import dreq
 import collections, string, os
 import vrev
@@ -343 +343 @@
     return '<li>%s {%s}: %s variables, %s request links</li>' % (  targ.__href__(odir='../u/', label=targ.label), targ.mip, gpsz, nlnk )
 
+class tables(object):
+  def __init__(self,sc, mips):
+      self.sc = sc
+      self.dq = sc.dq
+      self.mips = mips
+
+  def doTable(self,m,l1,m2,pmax,collector,acc=True):
+      """acc allows accumulation of values to be switched off when called in single expt mode"""
+        
+      x = self.sc.volByExpt( l1, m2, expFullEx=(m2 in self.mips), pmax=pmax )
+      if x[0] > 0:
+        collector[m].a[m2] += x[0]
+        im2 = self.dq.inx.uid[m2]
+#
+# create sum for each table
+#
+        xs = 0
+        for k in x[2].keys():
+          i = self.dq.inx.uid[k]
+          xxx =  x[2][k]
+          xs += xxx
+          if xxx > 0:
+            collector['_%s_%s' % (m,m2)].a[i.mipTable] += xxx
+        assert x[0] == xs, 'ERROR.0088: consistency problem %s  %s %s %s' % (m,m2,x[0],xs)
+        if x[0] == 0:
+          print 'Zero size:',m,m2
+          if len( x[2].keys() ) > 0:
+             print 'ERROR:zero: ',m,m2,x[2].keys()
+
+        if acc:
+          collector[m].a['TOTAL'] += x[0]
+        dd = collections.defaultdict( list )
+        lll = set()
+        for v in x[2].keys():
+          vi = self.sc.dq.inx.uid[v]
+          if vi._h.label != 'remarks':
+            f,t,l,tt,d,u = (vi.frequency,vi.mipTable,vi.label,vi.title,vi.description,vi.uid)
+            lll.add(u)
+            dd[t].append( (f,t,l,tt,d,u) )
+        if len( dd.keys() ) > 0:
+          collector[m].dd[m2] = dd
+          if im2._h.label == 'experiment':
+            dothis = self.sc.tierMax >= im2.tier
+###
+### BUT ... there is a treset in the request item .... it may be that some variables are excluded ...
+###         need the variable list itself .....
+###
+          makeTab( subset=lll, dest='tab2/%s-%s_%s_%s.xlsx' % (m,m2,self.sc.tierMax,pmax) )
+
 styls = styles()
 

CMIP6dreqbuild/trunk/src/framework/dreqPy/packageConfig.py

@@ -15 +15 @@
 
 __versionComment__ = "Added annex, improved content, various bug fixes"
-__version__ = "01.beta.17"
+__version__ = "01.beta.19"
 __title__ = "dreqPy"
 __description__ = "CMIP6 Data Request Python API"

CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

@@ -790 +790 @@
       for v in vl[:mx]:
         mlg.prnt ( '%s: %7.2fTb' % (self.dq.inx.uid[v].label, cc[v]*2.*1.e-12) )
+