Changeset 1254 for CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py

Timestamp:

20/08/18 14:01:12 (3 years ago)

Author:

mjuckes

Message:

fixed --txt option

File:

• CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py (modified) (9 diffs)

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

@@ -59 +59 @@
 
 class vsum(object):
-  def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls', tabByFreqRealm=False):
+  def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls', tabByFreqRealm=False,txt=False,txtOpts=None):
     self.tabByFreqRealm = tabByFreqRealm
+    self.doTxt = txt
+    self.txtOpts = txtOpts
     idir = dreq.DOC_DIR
     if 'collect' not in sc.dq._extensions_:
@@ -110 +112 @@
         theseMips =  ['TOTAL',] + self.sc.mips
       else:
-        theseMips = mips
+        theseMips = list(mips)
+
+## move *TOTAL to end of list.
+      if '*TOTAL' in theseMips:
+         theseMips.remove( '*TOTAL' )
+         theseMips.append( '*TOTAL' )
 
       self.rres = {}
       self.rresu = {}
+      self.accPdict = collections.defaultdict( set )
     
       for m in theseMips:
         olab = m
+        useAccPdict = False
         if m == '*TOTAL':
-            thism = theseMips.copy()
+            thism = theseMips[:]
             if type( thism ) == type( set() ):
               thism.remove( '*TOTAL' )
             else:
-              thism.pop( '*TOTAL' )
+              thism.remove( '*TOTAL' )
             olab = misc_utils.setMlab( thism )
+            useAccPdict = True
         elif type( theseMips ) == type( dict() ):
             thism = {m:theseMips[m]}
@@ -135 +145 @@
         self.run( thism, '%s/requestVol_%s_%s_%s' % (self.odir,olab,self.sc.tierMax,pmax), pmax=pmax,doxlsx=makeTabs )
 
-        self.anal(olab=olab,doUnique='TOTAL' in theseMips, makeTabs=makeTabs)
+        self.anal(olab=olab,doUnique='TOTAL' in theseMips, makeTabs=makeTabs, useAccPdict=useAccPdict)
         ttl = sum( [x for k,x in self.res['vu'].items()] )*2.*1.e-12
         volsmm[m] = self.res['vm']
@@ -190 +200 @@
       return '%s/%s_%s_%s_%s_%s%s' % (self.odir,self.xlsPrefixM,olab,lab2,self.sc.tierMax,self.pmax,self.efnsfx)
 
-  def anal(self,olab=None,doUnique=False,makeTabs=False,mode='full'):
+  def anal(self,olab=None,doUnique=False,makeTabs=False,mode='full',useAccPdict=False):
     vmt = collections.defaultdict( int )
     vm = collections.defaultdict( int )
@@ -250 +260 @@
         if makeTabs:
           ##table_utils.makeTab(self.sc.dq, subset=lm[m], dest=self.xlsDest('m',olab,m), collected=cc[m],exptUid=self.sc.exptByLabel.get(m,m) )
-          table_utils.makeTab(self.sc, subset=lm[m], dest=self.xlsDest('m',olab,m), collected=cc[m] )
+          table_utils.makeTab(self.sc, subset=lm[m], dest=self.xlsDest('m',olab,m), collected=cc[m], txt=self.doTxt, txtOpts=self.txtOpts )
 
     if olab != None and makeTabs:
-        table_utils.makeTab(self.sc, subset=ss, dest=self.xlsDest('m',olab,'TOTAL'), collected=cct)
+        table_utils.makeTab(self.sc, subset=ss, dest=self.xlsDest('m',olab,'TOTAL'), collected=cct, txt=self.doTxt, txtOpts=self.txtOpts )
         if olab != 'TOTAL' and doUnique:
-          table_utils.makeTab(self.sc, subset=s_lm, dest=self.xlsDest('m',olab,'Unique'), collected=s_cc)
+          table_utils.makeTab(self.sc, subset=s_lm, dest=self.xlsDest('m',olab,'Unique'), collected=s_cc, txt=self.doTxt, txtOpts=self.txtOpts )
 
     cc = collections.defaultdict( dict )
@@ -266 +276 @@
         el = self.sc.dq.inx.uid[e].label
 
-        if olab in ['Total','TOTAL']:
+        if useAccPdict:
+          pdict = collections.defaultdict( set )
+          for vid, p in self.accPdict[e]:
+               pdict[vid].add( p )
+             
+        elif olab in ['Total','TOTAL']:
           pdict = None
         elif (olab,el) in self.exptMipRql:
@@ -275 +290 @@
                rqv = self.sc.dq.inx.uid[rqvid]
                pdict[rqv.vid].add( rqv.priority )
+               self.accPdict[e].add( (rqv.vid,rqv.priority) )
         else:
-          print 'INFO.00201: olab,e not found:',olab,el
+          print ( 'INFO.00201: olab,e not found:',olab,el )
           pdict = None
 
@@ -285 +301 @@
         dest = self.xlsDest('e',olab,el)
         mode ='e'
-        table_utils.makeTab(self.sc, subset=lex[e], dest=self.xlsDest(mode,olab,el), collected=cc[e],byFreqRealm=self.tabByFreqRealm, tslice=tslice, exptUid=e, tabMode=mode, pdict=pdict)
+        table_utils.makeTab(self.sc, subset=lex[e], dest=self.xlsDest(mode,olab,el), collected=cc[e],byFreqRealm=self.tabByFreqRealm, tslice=tslice, exptUid=e, tabMode=mode, pdict=pdict, txt=self.doTxt, txtOpts=self.txtOpts )
 
     if olab != 'TOTAL' and doUnique:
@@ -293 +309 @@
         if olab != None and makeTabs:
           el = self.sc.dq.inx.uid[e].label
-          table_utils.makeTab(self.sc, subset=s_lex[e], dest=self.xlsDest('u',olab,el), collected=ucc[e])
+          table_utils.makeTab(self.sc, subset=s_lex[e], dest=self.xlsDest('u',olab,el), collected=ucc[e], txt=self.doTxt, txtOpts=self.txtOpts)
 
     self.res = { 'vmt':vmt, 'vet':vet, 'vm':vm, 'uve':uve, 've':ve, 'lm':lm, 'lex':lex, 'vu':vu, 'cc':cc, 'cct':cct, 'vf':vf}