Changeset 752

Timestamp:

19/09/16 16:18:13 (3 years ago)

Author:

mjuckes

Message:

checked distrib cand

Location:

CMIP6dreq/trunk/dreqPy

Files:

• makeTables.py (modified) (2 diffs)
• scope.py (modified) (1 diff)

CMIP6dreq/trunk/dreqPy/makeTables.py

@@ -1 +1 @@
 
 import collections, string, os, sys
-import rvgExtraTable
 
 nt__charmeEnable = collections.namedtuple( 'charme', ['id','site'] )
@@ -9 +8 @@
   import vrev
   import misc_utils
+  import rvgExtraTable
 except:
   import dreqPy.dreq as dreq
   import dreqPy.vrev as vrev
   import dreqPy.misc_utils as misc_utils
+  import dreqPy.rvgExtraTable as rvgExtraTable
 
 python2 = True

CMIP6dreq/trunk/dreqPy/scope.py

@@ -231 +231 @@
           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']}
+          ss = set( [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 )