Changeset 873

Timestamp:

17/11/16 10:42:40 (3 years ago)

Author:

mjuckes

Message:

switch added in vsum.analAll to prevent unnecessary production of html fields under --sf option

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

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

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

@@ -1 +1 @@
 
-import collections, string
+import collections, string, os
 import xlsxwriter
 
@@ -136 +136 @@
     if len( self.cc[kc].a.keys() ) == 0:
       return
+    if not os.path.isdir( 'tabs03' ):
+      print ( 'WARNING.makeMMhtml: creating directory for html files: tabs03' )
+      os.mkdir( 'tabs03' )
     oo = open( 'tabs03/%s' % fss, 'w' )
     ttl = 'Date requested by %s from %s experiments (tier %s, priority %s)' % (m,m2,self.tiermax,self.pmax)

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

@@ -1582 +1582 @@
       vs.run( self.adict['m'], 'requestVol_%s_%s_%s' % (mlab,tierMax,pmax), pmax=pmax ) 
       vs.anal(olab=mlab,doUnique=False)
-      vs.analAll(pmax,mips=self.adict['m'])
+      vs.analAll(pmax,mips=self.adict['m'],html=False)
       ttl = sum( [x for k,x in vs.res['vu'].items()] )*2.*1.e-12
       ttl2 = sum( [x for k,x in vs.res['vu'].items()] )*2.*1.e-12

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

@@ -76 +76 @@
     ii.close()
 
-  def analAll(self,pmax,mips=None):
+  def analAll(self,pmax,mips=None,html=True):
       volsmm={}
       volsmmt={}
@@ -101 +101 @@
           cmvTotal = self.sc.selectedCmv.copy()
           self.uniqueCmv =  {}
-      r1 = overviewTabs.r1( self.sc, self.mt_tables, pmax=pmax, vols=( volsmm, volsme, volsmmt,volsue ) )
+      if html:
+        r1 = overviewTabs.r1( self.sc, self.mt_tables, pmax=pmax, vols=( volsmm, volsme, volsmmt,volsue ) )
 
   def _analSelectedCmv(self,cmv):