Ignore:
Timestamp:
09/12/16 15:34:37 (3 years ago)
Author:
mjuckes
Message:

added descriptions to section index html pages

File:
1 edited

Legend:

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

    r885 r894  
    132132       u'monClim':12, u'Timestep':100, u'6hr':4*365, u'day':365, u'1day':365, u'mon':12, u'yr':1, 
    133133       u'1mon':12, 'month':12, 'year':1, 'monthly':12, 'hr':24*365, 'other':24*365, 
    134         'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1 } 
     134        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1 } 
    135135 
    136136## There are 4 cmor variables with blank frequency .... 
     
    172172    self.gridOceanStructured = True 
    173173    self.gridPolicyForce = None 
     174    self.retainRedundantRank = True 
    174175    self.gridPolicyTopOnly = True 
    175176    self.exptFilter = None 
     
    559560    return ff 
    560561 
    561   def volByExpt( self, l1, ex, pmax=1, cc=None, retainRedundantRank=False, intersection=False,expFullEx=False, adsCount=False ): 
     562  def volByExpt( self, l1, ex, pmax=1, cc=None, intersection=False,expFullEx=False, adsCount=False ): 
    562563    """volByExpt: calculates the total data volume associated with an experiment/experiment group and a list of request items. 
    563564          The calculation has some approximations concerning the number of years in each experiment group. 
     
    591592## filter by configuration option and rank 
    592593## 
    593     if not retainRedundantRank: 
     594    if not self.retainRedundantRank: 
    594595      len1 = len(vars.keys()) 
    595596      cmv = self.cmvFilter.filterByChoiceRank(cmv=vars.keys()) 
     
    11241125      cmv2, cmvts2 = self.cmvByMip('TOTAL',pmax=pmax,includeYears=True,exptFilter=self.exptFilter,exptFilterBlack=self.exptFilterBlack) 
    11251126      cmv = self.differenceSelectedCmvDict(  cmv1, cmv2 ) 
     1127 
     1128    if not self.retainRedundantRank: 
     1129      len1 = len(cmv) 
     1130      self.cmvFilter.filterByChoiceRank(cmv=cmv,asDict=True) 
     1131      len2 = len(cmv) 
     1132      print 'INFO.redundant.0001: length %s --> %s' % (len1,len2) 
     1133    else: 
     1134      print 'INFO.redundant.0002' 
    11261135  
    11271136    self.selectedCmv = cmv 
     
    13531362        return l2 
    13541363 
    1355   def volByMip( self, mip, pmax=2, retainRedundantRank=False, intersection=False, adsCount=False, exptid=None): 
     1364  def volByMip( self, mip, pmax=2, intersection=False, adsCount=False, exptid=None): 
    13561365 
    13571366    l1 = self.rqiByMip( mip ) 
     
    13741383      if expts not in  [None,[]]: 
    13751384        for ei in expts: 
    1376           self.volByE[ei.label] = self.volByExpt( l1, ei.uid, pmax=pmax, cc=cc, retainRedundantRank=retainRedundantRank, intersection=intersection, adsCount=adsCount ) 
     1385          self.volByE[ei.label] = self.volByExpt( l1, ei.uid, pmax=pmax, cc=cc, intersection=intersection, adsCount=adsCount ) 
    13771386          vtot += self.volByE[ei.label][0] 
    13781387        self.allVars = self.allVars.union( self.vars ) 
     
    16371646    ##doSf = 'SF' in self.adict or 'sf' in self.adict 
    16381647    doSf = 'legacy' not in self.adict 
     1648    if doSf: 
     1649      self.adict['sf'] = True 
    16391650    assert not ('legacy' in self.adict and 'sf' in self.adict), "Conflicting command line argument, 'legacy' and 'sf': use only one of these" 
    16401651    if makeXls or makeTxt or doSf: 
Note: See TracChangeset for help on using the changeset viewer.