Changeset 784


Ignore:
Timestamp:
24/10/16 12:10:23 (3 years ago)
Author:
mjuckes
Message:

extended support for -e to --sf version

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

Legend:

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

    r779 r784  
    905905    l1,ee = self.rvgByMip( mip, includePreset=True, returnLinks=True ) 
    906906    if includeYears: 
    907       expys = self.exptYears( l1 ) 
     907      expys = self.exptYears( l1, ex=exptFilter ) 
    908908      cc = collections.defaultdict( set ) 
    909909    ss = set() 
     
    15581558    assert ok,'Available MIPs: %s' % str(self.sc.mips) 
    15591559 
     1560    eid = None 
     1561    ex = None 
     1562    if 'e' in self.adict: 
     1563      ex = self.adict['e'] 
     1564      if ex in self.sc.mips: 
     1565        eid = set( self.dq.inx.iref_by_sect[ex].a['experiment'] ) 
     1566        self.sc.exptFilter = eid 
     1567      else: 
     1568        for i in self.dq.coll['experiment'].items: 
     1569          if i.label == self.adict['e']: 
     1570            eid = i.uid 
     1571        assert eid != None, 'Experiment/MIP %s not found' % self.adict['e'] 
     1572        self.sc.exptFilter = set( [eid,] ) 
     1573 
    15601574    if 'sf' in self.adict: 
    15611575      import volsum 
     
    15681582      return 
    15691583 
    1570  
    1571     eid = None 
    1572     ex = None 
    1573     if 'e' in self.adict: 
    1574       ex = self.adict['e'] 
    1575       for i in self.dq.coll['experiment'].items: 
    1576         if i.label == self.adict['e']: 
    1577           eid = i.uid 
    1578       assert eid != None, 'Experiment %s not found' % self.adict['e'] 
    15791584 
    15801585    adsCount = self.adict.get( 'count', False ) 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py

    r779 r784  
    6363      self.infoRows.append( ll ) 
    6464    ii.close() 
    65  
    6665 
    6766  def analAll(self,pmax): 
Note: See TracChangeset for help on using the changeset viewer.