Changeset 741

Timestamp:

06/09/16 13:09:33 (3 years ago)

Author:

mjuckes

Message:

fixed problems with request link listing by MIP

File:

• CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py (modified) (3 diffs)

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

@@ -65 +65 @@
 def filter2( a, b, tt, tm ):
 ## largest tier less than or equal to tm
-  t1 = [t for t in tt if t <= tm][-1]
-  it1 = tt.index(t1)
-  aa = a[it1]
-  if b < 0:
-    return aa
+  ll = [t for t in tt if t <= tm]
+  if len( ll ) > 0:
+    t1 = [t for t in tt if t <= tm][-1]
+    it1 = tt.index(t1)
+    aa = a[it1]
+    if b < 0:
+      return aa
+    else:
+      return min( [aa,b] )
   else:
-    return min( [aa,b] )
+    return 0
 
 npy = {'1hrClimMon':24*12, 'daily':365, u'Annual':1, u'fx':0.01, u'1hr':24*365, u'3hr':8*365,
@@ -207 +211 @@
 
     s = set()
-    for i in self.dq.coll['objectiveLink'].items:
-      if t1(i.label):
-        s.add( self.dq.inx.uid[i.rid] )
-
-    ##self.rqs = list({self.dq.inx.uid[i.rid] for i in self.dq.coll['objectiveLink'].items if t1(i.label) })
+    for i in self.dq.coll['requestLink'].items:
+      if t1(i.mip):
+        if 'requestItem' in self.dq.inx.iref_by_sect[i.uid].a:
+          if any( [ self.rqiExp[x][-1] > 0 for  x in self.dq.inx.iref_by_sect[i.uid].a['requestItem'] if x in self.rqiExp ] ):
+            s.add( i )
+
     self.rqs = list( s )
     return self.rqs
@@ -221 +226 @@
 
     s = set()
-    for i in self.dq.coll['objectiveLink'].items:
-      if i.label in mipSel:
-        if len(mipSel[i]) == 0 or self.dq.inx.uid[i.oid].label in mipSel[i]:
-          s.add( self.dq.inx.uid[i.rid] )
-    ##self.rqs = list({self.dq.inx.uid[i.rid] for i in self.dq.coll['objectiveLink'].items if t1(i.label) })
-    self.rqs = list( s )
-    return self.rqs
-
-  def getRequestLinkByObjective( self, objSel ):
-    """Return the set of request links which are associated with specified objectives"""
-    if type(objSel) == type(''):
-      t1 = lambda x: x == self.rlu[objSel]
-    elif type(objSel) == type(set()):
-      t1 = lambda x: x in [self.rlu[i] for i in objSel]
-
-    s = set()
-    for i in self.dq.coll['objectiveLink'].items:
-      if t1(i.label):
-        s.add( self.dq.inx.uid[i.oid] )
-##
-    self.rqs = list( s )
-    ##self.rqs = list({self.dq.inx.uid[i.rid] for i in self.dq.coll['objectiveLink'].items if t1(i.oid) })
+    for i in self.dq.coll['requestLink'].items:
+      if i.mip in mipSel:
+        if len(mipSel[i.mip]) == 0:
+          s.add( i )
+        elif 'objectiveLink' in self.dq.inx.iref_by_sect[i.uid].a:
+          ss = {self.dq.inx.uid[k].label for k in self.dq.inx.iref_by_sect[i.uid].a['objectiveLink']}
+          if any( [x in mipSel[i.mip] for x in ss] ):
+            s.add( i )
+##
+## filter requestLinks by tierMax: check to see whether they link to experiments with tier below or equal to tiermax.
+##
+    s1 = set()
+    for i in s:
+      if 'requestItem' in self.dq.inx.iref_by_sect[i.uid].a:
+        if any( [ self.rqiExp[x][-1] > 0 for  x in self.dq.inx.iref_by_sect[i.uid].a['requestItem'] if x in self.rqiExp ] ):
+            s1.add( i )
+
+    self.rqs = list( s1 )
     return self.rqs