Changeset 784 for CMIP6dreqbuild

Timestamp:

24/10/16 12:10:23 (4 years ago)

Author:

mjuckes

Message:

extended support for -e to --sf version

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• scope.py (modified) (3 diffs)
• volsum.py (modified) (1 diff)

CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

@@ -905 +905 @@
     l1,ee = self.rvgByMip( mip, includePreset=True, returnLinks=True )
     if includeYears:
-      expys = self.exptYears( l1 )
+      expys = self.exptYears( l1, ex=exptFilter )
       cc = collections.defaultdict( set )
     ss = set()
@@ -1558 +1558 @@
     assert ok,'Available MIPs: %s' % str(self.sc.mips)
 
+    eid = None
+    ex = None
+    if 'e' in self.adict:
+      ex = self.adict['e']
+      if ex in self.sc.mips:
+        eid = set( self.dq.inx.iref_by_sect[ex].a['experiment'] )
+        self.sc.exptFilter = eid
+      else:
+        for i in self.dq.coll['experiment'].items:
+          if i.label == self.adict['e']:
+            eid = i.uid
+        assert eid != None, 'Experiment/MIP %s not found' % self.adict['e']
+        self.sc.exptFilter = set( [eid,] )
+
     if 'sf' in self.adict:
       import volsum
@@ -1568 +1582 @@
       return
 
-
-    eid = None
-    ex = None
-    if 'e' in self.adict:
-      ex = self.adict['e']
-      for i in self.dq.coll['experiment'].items:
-        if i.label == self.adict['e']:
-          eid = i.uid
-      assert eid != None, 'Experiment %s not found' % self.adict['e']
 
     adsCount = self.adict.get( 'count', False )

CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py

@@ -63 +63 @@
       self.infoRows.append( ll )
     ii.close()
-
 
   def analAll(self,pmax):