Changeset 842

Timestamp:

09/11/16 11:29:53 (4 years ago)

Author:

mjuckes

Message:

further import corrections

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• makeTables.py (modified) (1 diff)
• scope.py (modified) (2 diffs)
• volsum.py (modified) (5 diffs)

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

@@ -612 +612 @@
 
   def getTable(self,m,m2,pmax,odsz,npy):
-     vs = volsum.vsum( self.sc, 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 )

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

@@ -1538 +1538 @@
       import volsum
       self.sc.gridPolicyDefaultNative = True
-      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
       vs.analAll(pmax)
 
       self.sc.gridPolicyDefaultNative = False
-      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
       vs.analAll(pmax)
 
       self.sc.setTierMax( 3 )
-      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
       vs.analAll(3)
       return
@@ -1578 +1578 @@
     if 'sf' in self.adict:
       import volsum
-      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
+      vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir )
       vs.run( self.adict['m'], 'requestVol_%s_%s_%s' % (mlab,tierMax,pmax), pmax=pmax ) 
       vs.anal(olab=mlab,doUnique=False)

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

@@ -6 +6 @@
 try:
   import dreq
-
-  import scope
-  import makeTables
   import overviewTabs
 except:
   import dreqPy.dreq as dreq
-  import dreqPy.scope as scope
-  import dreqPy.makeTables as makeTables
   import dreqPy.overviewTabs as overviewTabs
 
@@ -49 +44 @@
 
 class vsum(object):
-  def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls'):
+  def __init__(self,sc,odsz,npy,makeTab,exptFilter=None, odir='xls'):
+    self.makeTab = makeTab
     idir = dreq.DOC_DIR
     self.sc = sc
@@ -185 +181 @@
         ss = ss.union( lm[m] )
         if makeTabs:
-          makeTables.makeTab(self.sc.dq, subset=lm[m], dest='%s/cmvmm_%s_%s_%s_%s%s' % (self.odir,olab,m,self.sc.tierMax,self.pmax,self.efnsfx), collected=cc[m])
+          self.makeTab(self.sc.dq, subset=lm[m], dest='%s/cmvmm_%s_%s_%s_%s%s' % (self.odir,olab,m,self.sc.tierMax,self.pmax,self.efnsfx), collected=cc[m])
 
     if olab != None and makeTabs:
-        makeTables.makeTab(self.sc.dq, subset=ss, dest='%s/cmvmm_%s_%s_%s_%s%s' % (self.odir,olab,'TOTAL',self.sc.tierMax,self.pmax,self.efnsfx), collected=cct)
+        self.makeTab(self.sc.dq, subset=ss, dest='%s/cmvmm_%s_%s_%s_%s%s' % (self.odir,olab,'TOTAL',self.sc.tierMax,self.pmax,self.efnsfx), collected=cct)
         if olab != 'TOTAL' and doUnique:
-          makeTables.makeTab(self.sc.dq, subset=s_lm, dest='%s/cmvmm_%s_%s_%s_%s%s' % (self.odir,olab,'Unique',self.sc.tierMax,self.pmax,self.efnsfx), collected=s_cc)
+          self.makeTab(self.sc.dq, subset=s_lm, dest='%s/cmvmm_%s_%s_%s_%s%s' % (self.odir,olab,'Unique',self.sc.tierMax,self.pmax,self.efnsfx), collected=s_cc)
 
     cc = collections.defaultdict( dict )
@@ -200 +196 @@
       if olab != None and makeTabs:
         el = self.sc.dq.inx.uid[e].label
-        makeTables.makeTab(self.sc.dq, subset=lex[e], dest='%s/cmvme_%s_%s_%s_%s%s' % (self.odir,olab,el,self.sc.tierMax,self.pmax,self.efnsfx), collected=cc[e])
+        self.makeTab(self.sc.dq, subset=lex[e], dest='%s/cmvme_%s_%s_%s_%s%s' % (self.odir,olab,el,self.sc.tierMax,self.pmax,self.efnsfx), collected=cc[e])
 
     if olab != 'TOTAL' and doUnique:
@@ -208 +204 @@
         if olab != None and makeTabs:
           el = self.sc.dq.inx.uid[e].label
-          makeTables.makeTab(self.sc.dq, subset=s_lex[e], dest='%s/cmvume_%s_%s_%s_%s%s' % (self.odir,olab,el,self.sc.tierMax,self.pmax,self.efnsfx), collected=ucc[e])
+          self.makeTab(self.sc.dq, subset=s_lex[e], dest='%s/cmvume_%s_%s_%s_%s%s' % (self.odir,olab,el,self.sc.tierMax,self.pmax,self.efnsfx), collected=ucc[e])
 
     self.res = { 'vmt':vmt, 'vet':vet, 'vm':vm, 'uve':uve, 've':ve, 'lm':lm, 'lex':lex, 'vu':vu, 'cc':cc, 'cct':cct}