Changeset 842
- Timestamp:
- 09/11/16 11:29:53 (4 years ago)
- Location:
- CMIP6dreqbuild/trunk/src/framework/dreqPy
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py
r835 r842 612 612 613 613 def getTable(self,m,m2,pmax,odsz,npy): 614 vs = volsum.vsum( self.sc, odsz, npy )614 vs = volsum.vsum( self.sc, odsz, npy, makeTab ) 615 615 mlab = setMlab( m ) 616 616 vs.run( m, 'requestVol_%s_%s_%s' % (mlab,self.sc.tierMax,pmax), pmax=pmax ) -
CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py
r828 r842 1538 1538 import volsum 1539 1539 self.sc.gridPolicyDefaultNative = True 1540 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )1540 vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir ) 1541 1541 vs.analAll(pmax) 1542 1542 1543 1543 self.sc.gridPolicyDefaultNative = False 1544 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )1544 vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir ) 1545 1545 vs.analAll(pmax) 1546 1546 1547 1547 self.sc.setTierMax( 3 ) 1548 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )1548 vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir ) 1549 1549 vs.analAll(3) 1550 1550 return … … 1578 1578 if 'sf' in self.adict: 1579 1579 import volsum 1580 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )1580 vs = volsum.vsum( self.sc, odsz, npy, makeTables.makeTab, odir=xlsOdir ) 1581 1581 vs.run( self.adict['m'], 'requestVol_%s_%s_%s' % (mlab,tierMax,pmax), pmax=pmax ) 1582 1582 vs.anal(olab=mlab,doUnique=False) -
CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py
r839 r842 6 6 try: 7 7 import dreq 8 9 import scope10 import makeTables11 8 import overviewTabs 12 9 except: 13 10 import dreqPy.dreq as dreq 14 import dreqPy.scope as scope15 import dreqPy.makeTables as makeTables16 11 import dreqPy.overviewTabs as overviewTabs 17 12 … … 49 44 50 45 class vsum(object): 51 def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls'): 46 def __init__(self,sc,odsz,npy,makeTab,exptFilter=None, odir='xls'): 47 self.makeTab = makeTab 52 48 idir = dreq.DOC_DIR 53 49 self.sc = sc … … 185 181 ss = ss.union( lm[m] ) 186 182 if makeTabs: 187 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])183 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]) 188 184 189 185 if olab != None and makeTabs: 190 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)186 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) 191 187 if olab != 'TOTAL' and doUnique: 192 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)188 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) 193 189 194 190 cc = collections.defaultdict( dict ) … … 200 196 if olab != None and makeTabs: 201 197 el = self.sc.dq.inx.uid[e].label 202 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])198 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]) 203 199 204 200 if olab != 'TOTAL' and doUnique: … … 208 204 if olab != None and makeTabs: 209 205 el = self.sc.dq.inx.uid[e].label 210 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])206 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]) 211 207 212 208 self.res = { 'vmt':vmt, 'vet':vet, 'vm':vm, 'uve':uve, 've':ve, 'lm':lm, 'lex':lex, 'vu':vu, 'cc':cc, 'cct':cct}
Note: See TracChangeset
for help on using the changeset viewer.