Changeset 774 for CMIP6dreqbuild
- Timestamp:
- 11/10/16 16:41:19 (4 years ago)
- Location:
- CMIP6dreqbuild/trunk/src/framework/dreqPy
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py
r771 r774 1525 1525 self.sc.setTierMax( tierMax ) 1526 1526 pmax = self.adict.get( 'p', 1 ) 1527 1528 makeXls = self.adict.get( 'xls', False ) 1529 makeTxt = self.adict.get( 'txt', False ) 1530 doSf = 'SF' in self.adict or 'sf' in self.adict 1531 if makeXls or makeTxt or doSf: 1532 xlsOdir = self.adict.get( 'xlsdir', 'xls' ) 1533 self.sc.checkDir( xlsOdir, 'xls files' ) 1534 1527 1535 if 'SF' in self.adict: 1528 1536 import volsum 1529 1537 self.sc.gridPolicyDefaultNative = True 1530 vs = volsum.vsum( self.sc, odsz, npy )1538 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir ) 1531 1539 vs.analAll(pmax) 1532 1540 1533 1541 self.sc.gridPolicyDefaultNative = False 1534 vs = volsum.vsum( self.sc, odsz, npy )1542 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir ) 1535 1543 vs.analAll(pmax) 1536 1544 1537 1545 self.sc.setTierMax( 3 ) 1538 vs = volsum.vsum( self.sc, odsz, npy )1546 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir ) 1539 1547 vs.analAll(3) 1540 1548 return … … 1554 1562 if 'sf' in self.adict: 1555 1563 import volsum 1556 vs = volsum.vsum( self.sc, odsz, npy )1564 vs = volsum.vsum( self.sc, odsz, npy, odir=xlsOdir ) 1557 1565 vs.run( self.adict['m'], 'requestVol_%s_%s_%s' % (mlab,tierMax,pmax), pmax=pmax ) 1558 1566 vs.anal(olab=mlab,doUnique=False) … … 1579 1587 if makeXls or makeTxt: 1580 1588 mips = self.adict['m'] 1581 odir = self.adict.get( 'xlsdir', 'xls' )1582 self.sc.checkDir( odir, 'xls files' )1583 1589 1584 1590 if 'txtOpts' in self.adict: … … 1590 1596 txtOpts=None 1591 1597 1592 self.sc.xlsByMipExpt(mips,eid,pmax,odir= odir,xls=makeXls,txt=makeTxt,txtOpts=txtOpts)1598 self.sc.xlsByMipExpt(mips,eid,pmax,odir=xlsOdir,xls=makeXls,txt=makeTxt,txtOpts=txtOpts) 1593 1599 1594 1600 def printList(self): -
CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py
r770 r774 1 1 2 2 import scope 3 import dreq 3 4 import xlsxwriter 4 5 from xlsxwriter.utility import xl_rowcol_to_cell … … 40 41 41 42 class vsum(object): 42 def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls1'): 43 def __init__(self,sc,odsz,npy,exptFilter=None, odir='xls'): 44 idir = dreq.DOC_DIR 43 45 self.sc = sc 44 46 self.odsz=odsz … … 54 56 print ( 'Creating new directory for xlsx output: %s' % odir ) 55 57 os.mkdir( odir ) 56 ii = open( ' out/sfheadings.csv', 'r' )58 ii = open( '%s/sfheadings.csv' % idir, 'r' ) 57 59 self.infoRows = [] 58 60 for l in ii.readlines():
Note: See TracChangeset
for help on using the changeset viewer.