Ignore:
Timestamp:
02/02/16 15:05:50 (5 years ago)
Author:
mjuckes
Message:

distrib ready ...

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/overviewTabs.py

    r568 r583  
    55from dreqPy import scope 
    66import xlsxwriter 
    7 import makeTables 
     7from dreqPy import makeTables 
    88 
    99jsh=''' 
     
    4343    self.mips = ['AerChemMIP', 'C4MIP', 'CFMIP', 'DAMIP', 'DCPP', 'FAFMIP', 'GeoMIP', 'GMMIP', 'HighResMIP', 'ISMIP6', 'LS3MIP', 'LUMIP', 'OMIP', 'PMIP', 'RFMIP', 'ScenarioMIP', 'VolMIP', 'CORDEX', 'DynVar', 'SIMIP', 'VIACSAB'] 
    4444    self.mipsp = ['DECK','CMIP6',] + self.mips[:-4] 
     45    tabs = makeTables.tables( sc, self.mips ) 
     46 
    4547    for m in self.mips + ['TOTAL',]: 
    4648      if m == 'TOTAL': 
     
    6264        if sss: 
    6365          for i in xx: 
    64             self.doTable(m,l1,i.uid,self.cc,acc=False) 
    65           self.doTable(m,l1,m2,self.cc) 
     66            tabs.doTable(m,l1,i.uid,pmax,self.cc,acc=False) 
     67          tabs.doTable(m,l1,m2,pmax,self.cc) 
    6668          self.makeMMhtml(m,m2) 
    6769        else: 
    68           self.doTable(m,l1,m2,self.cc) 
     70          tabs.doTable(m,l1,m2,pmax,self.cc) 
    6971 
    7072    self.writeMips(sss) 
    7173 
    7274  def makeMMhtml(self,m,m2): 
     75    """Make a html page for data requested by MIP 'm' from MIP 'm2' experiments""" 
    7376    fss = '%s-%s_%s_%s.html' % (m,m2,self.tiermax, self.pmax) 
    7477    kc = '_%s_%s' % (m,m2) 
     
    177180    oo.close() 
    178181 
     182 
     183class tablesxxxx(object): 
     184  def __init__(self,dq): 
     185     self.dq = dq 
    179186  def doTable(self,m,l1,m2,collector,acc=True): 
    180187      """acc allows accumulation of values to be switched off when called in single expt mode""" 
Note: See TracChangeset for help on using the changeset viewer.