Changeset 774 for CMIP6dreqbuild

Timestamp:

11/10/16 16:41:19 (3 years ago)

Author:

mjuckes

Message:

cleaned xls output directory logic

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• scope.py (modified) (4 diffs)
• volsum.py (modified) (3 diffs)

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

@@ -1525 +1525 @@
     self.sc.setTierMax(  tierMax )
     pmax = self.adict.get( 'p', 1 )
+
+    makeXls = self.adict.get( 'xls', False )
+    makeTxt = self.adict.get( 'txt', False )
+    doSf = 'SF' in self.adict or 'sf' in self.adict
+    if makeXls or makeTxt or doSf:
+      xlsOdir = self.adict.get( 'xlsdir', 'xls' )
+      self.sc.checkDir( xlsOdir, 'xls files' )
+
     if 'SF' in self.adict:
       import volsum
       self.sc.gridPolicyDefaultNative = True
-      vs = volsum.vsum( self.sc, odsz, npy )
+      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
       vs.analAll(pmax)
 
       self.sc.gridPolicyDefaultNative = False
-      vs = volsum.vsum( self.sc, odsz, npy )
+      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
       vs.analAll(pmax)
 
       self.sc.setTierMax( 3 )
-      vs = volsum.vsum( self.sc, odsz, npy )
+      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
       vs.analAll(3)
       return
@@ -1554 +1562 @@
     if 'sf' in self.adict:
       import volsum
-      vs = volsum.vsum( self.sc, odsz, npy )
+      vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir )
       vs.run( self.adict['m'], 'requestVol_%s_%s_%s' % (mlab,tierMax,pmax), pmax=pmax ) 
       vs.anal(olab=mlab,doUnique=False)
@@ -1579 +1587 @@
     if makeXls or makeTxt:
       mips = self.adict['m']
-      odir = self.adict.get( 'xlsdir', 'xls' )
-      self.sc.checkDir( odir, 'xls files' )
 
       if 'txtOpts' in self.adict:
@@ -1590 +1596 @@
         txtOpts=None
 
-      self.sc.xlsByMipExpt(mips,eid,pmax,odir=odir,xls=makeXls,txt=makeTxt,txtOpts=txtOpts)
+      self.sc.xlsByMipExpt(mips,eid,pmax,odir=xlsOdir,xls=makeXls,txt=makeTxt,txtOpts=txtOpts)
 
   def printList(self):

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

@@ -1 +1 @@
 
 import scope
+import dreq
 import xlsxwriter
 from xlsxwriter.utility import xl_rowcol_to_cell
@@ -40 +41 @@
 
 class vsum(object):
-  def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls1'):
+  def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls'):
+    idir = dreq.DOC_DIR
     self.sc = sc
     self.odsz=odsz
@@ -54 +56 @@
       print ( 'Creating new directory for xlsx output: %s' % odir )
       os.mkdir( odir )
-    ii = open( 'out/sfheadings.csv', 'r' )
+    ii = open( '%s/sfheadings.csv' % idir, 'r' )
     self.infoRows = []
     for l in ii.readlines():