Changeset 1284


Ignore:
Timestamp:
22/11/18 09:19:31 (6 months ago)
Author:
mjuckes
Message:

new overviewtabs

Location:
CMIP6dreqbuild/trunk/src/framework/dreqPy
Files:
3 edited

Legend:

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

    r1277 r1284  
    55  import dreq 
    66  import scope_utils 
     7  import table_utils 
    78except: 
    89  import dreqPy.dreq as dreq 
    910  import dreqPy.scope_utils as scope_utils 
     11  import dreqPy.table_utils as table_utils 
    1012 
    1113jsh=''' 
     
    141143    if len( self.cc[kc].a.keys() ) == 0: 
    142144      return 
    143     if not os.path.isdir( 'tabs03' ): 
     145    if not os.path.isdir( 'html/tabs03' ): 
    144146      print ( 'WARNING.makeMMhtml: creating directory for html files: tabs03' ) 
    145       os.mkdir( 'tabs03' ) 
    146     oo = open( 'tabs03/%s' % fss, 'w' ) 
     147      os.mkdir( 'html/tabs03' ) 
     148    oo = open( 'html/tabs03/%s' % fss, 'w' ) 
    147149    ttl = 'Data requested by %s from %s experiments (tier %s, priority %s)' % (m,m2,self.tiermax,self.pmax) 
    148150    jsh = '' 
     
    303305    import dreqPy.makeTables as makeTables 
    304306  sc = scope.dreqQuery() 
    305   r = r1( sc, makeTables.tables, tiermax=1, pmax=1 ) 
    306   r = r1( sc, makeTables.tables, tiermax=3, pmax=3 ) 
     307  r = r1( sc, table_utils.tables, tiermax=1, pmax=1 ) 
     308  r = r1( sc, table_utils.tables, tiermax=3, pmax=3 ) 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

    r1270 r1284  
    10111011 
    10121012    l20 = self.rqiByMip0( mip ) 
    1013     for i in l20: 
    1014       assert i in l2 
     1013    ##for i in l20: 
     1014      ##assert i in l2 
    10151015    return l2 
    10161016     
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/vrev.py

    r1062 r1284  
    111111      s3 = set() 
    112112 
    113       if expt != None: 
     113      if expt != None and expt in self.sc.rqLinkByExpt: 
    114114        for i in s2: 
    115115          if i in self.sc.rqLinkByExpt[expt]: 
Note: See TracChangeset for help on using the changeset viewer.