Changeset 784 for CMIP6dreqbuild
- Timestamp:
- 24/10/16 12:10:23 (4 years ago)
- Location:
- CMIP6dreqbuild/trunk/src/framework/dreqPy
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py
r779 r784 905 905 l1,ee = self.rvgByMip( mip, includePreset=True, returnLinks=True ) 906 906 if includeYears: 907 expys = self.exptYears( l1 )907 expys = self.exptYears( l1, ex=exptFilter ) 908 908 cc = collections.defaultdict( set ) 909 909 ss = set() … … 1558 1558 assert ok,'Available MIPs: %s' % str(self.sc.mips) 1559 1559 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 1560 1574 if 'sf' in self.adict: 1561 1575 import volsum … … 1568 1582 return 1569 1583 1570 1571 eid = None1572 ex = None1573 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.uid1578 assert eid != None, 'Experiment %s not found' % self.adict['e']1579 1584 1580 1585 adsCount = self.adict.get( 'count', False ) -
CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py
r779 r784 63 63 self.infoRows.append( ll ) 64 64 ii.close() 65 66 65 67 66 def analAll(self,pmax):
Note: See TracChangeset
for help on using the changeset viewer.