Changeset 856 for CMIP6dreq

Timestamp:

09/11/16 12:28:42 (3 years ago)

Author:

mjuckes

Message:

further import updates

Location:

CMIP6dreq/trunk/dreqPy

Files:

• docs/CMIP6_MIP_tables.xlsx (modified) (previous)
• makeTables.py (modified) (2 diffs)
• overviewTabs.py (modified) (4 diffs)
• scope.py (modified) (1 diff)
• volsum.py (modified) (2 diffs)

CMIP6dreq/trunk/dreqPy/makeTables.py

@@ -591 +591 @@
     return '<li>%s {%s}: %s variables, %s request links</li>' % (  targ.__href__(odir='../u/', label=targ.label), targ.mip, gpsz, nlnk )
 
+def obsolete_getTable(sc,m,m2,pmax,odsz,npy,odir='d1',txt=False,xls=False,txtOpts=None):
+     """replaces tables.getTable( self, m,m2,pmax,odsz,npy)"""
+##
+## this creates a new instance, and calls doTable ....
+## very messy ...
+##
+     vs = volsum.vsum( sc, odsz, npy, makeTab, tables )
+     mlab = setMlab( m )
+     vs.run( m, 'requestVol_%s_%s_%s' % (mlab,sc.tierMax,pmax), pmax=pmax )
+
+
+## collected=summed volumes by table for first page.
+     makeTab( sc.dq, subset=vs.thiscmvset, dest='%s/%s-%s_%s_%s' % (odir,mlab,mlab2,sc.tierMax,pmax), collected=collector[kkc].a,
+              mcfgNote=sc.mcfgNote,
+              txt=doTxt, xls=doXls, txtOpts=txtOpts )
+
 class tables(object):
   def __init__(self,sc, odir='xls',xls=True,txt=False,txtOpts=None):
@@ -611 +627 @@
 
 
-  def getTable(self,m,m2,pmax,odsz,npy):
-     vs = volsum.vsum( self.sc, odsz, npy, makeTab )
-     mlab = setMlab( m )
-     vs.run( m, 'requestVol_%s_%s_%s' % (mlab,self.sc.tierMax,pmax), pmax=pmax )
-
-
-## collected=summed volumes by table for first page.
-     makeTab( self.sc.dq, subset=vs.thiscmvset, dest='%s/%s-%s_%s_%s' % (self.odir,mlab,mlab2,self.sc.tierMax,pmax), collected=collector[kkc].a,
-              mcfgNote=self.sc.mcfgNote,
-              txt=self.doTxt, xls=self.doXls, txtOpts=self.txtOpts )
   def doTable(self,m,l1,m2,pmax,collector,acc=True, mlab=None,exptids=None,cc=None):
       """*acc* allows accumulation of values to be switched off when called in single expt mode"""

CMIP6dreq/trunk/dreqPy/overviewTabs.py

@@ -5 +5 @@
 try:
   import dreq
-  import makeTables
 except:
   import dreqPy.dreq as dreq
-  import dreqPy.makeTables as makeTables
 
 jsh='''
@@ -39 +37 @@
 hmap0 = {'CMIP6':'Historical'}
 class r1(object):
-  def __init__(self,sc,tiermax=1,pmax=1,only=False,vols=None,fnm='new'):
+  def __init__(self,sc,mt_tables,tiermax=1,pmax=1,only=False,vols=None,fnm='new'):
+    self.mt_tables = mt_tables
 
     self.fnm = fnm
@@ -93 +92 @@
     self.tiermax=tiermax
     sc.setTierMax( tiermax )
-    tabs = makeTables.tables( sc )
+    tabs = self.mt_tables( sc )
 
     mipsToDo = self.mips + ['TOTAL',]
@@ -283 +282 @@
 if __name__ == "__main__":
   try:
+    import makeTables
     import scope
   except:
     import dreqPy.scope as scope
+    import dreqPy.makeTables as makeTables
   sc = scope.dreqQuery()
-  r = r1( sc, tiermax=1, pmax=1 )
-  r = r1( sc, tiermax=3, pmax=3 )
+  r = r1( sc, makeTables.tables, tiermax=1, pmax=1 )
+  r = r1( sc, makeTables.tables, tiermax=3, pmax=3 )

CMIP6dreq/trunk/dreqPy/scope.py

@@ -1538 +1538 @@
       import volsum
       self.sc.gridPolicyDefaultNative = True
-      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, makeTables.tables, odir=xlsOdir )
       vs.analAll(pmax)
 
       self.sc.gridPolicyDefaultNative = False
-      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, makeTables.tables, odir=xlsOdir )
       vs.analAll(pmax)
 
       self.sc.setTierMax( 3 )
-      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, makeTables.tables, odir=xlsOdir )
       vs.analAll(3)
       return

CMIP6dreq/trunk/dreqPy/volsum.py

@@ -44 +44 @@
 
 class vsum(object):
-  def __init__(self,sc,odsz,npy,makeTab,exptFilter=None, odir='xls'):
+  def __init__(self,sc,odsz,npy,makeTab,mt_tables,exptFilter=None, odir='xls'):
     self.makeTab = makeTab
+    self.mt_tables = mt_tables
     idir = dreq.DOC_DIR
     self.sc = sc
@@ -89 +90 @@
           cmvTotal = self.sc.selectedCmv.copy()
           self.uniqueCmv =  {}
-      r1 = overviewTabs.r1( self.sc, pmax=pmax, vols=( volsmm, volsme, volsmmt,volsue ) )
+      r1 = overviewTabs.r1( self.sc, self.mt_tables, pmax=pmax, vols=( volsmm, volsme, volsmmt,volsue ) )
 
   def _analSelectedCmv(self,cmv):