Changeset 884 for CMIP6dreqbuild/trunk/src/framework/ingest/dreq_consol_dreq2.py

Timestamp:

30/11/16 10:00:03 (4 years ago)

Author:

mjuckes

Message:

added key VIACSAB integration code

File:

• CMIP6dreqbuild/trunk/src/framework/ingest/dreq_consol_dreq2.py (modified) (3 diffs)

CMIP6dreqbuild/trunk/src/framework/ingest/dreq_consol_dreq2.py

@@ -15 +15 @@
 
 deckExptMap = {'CMIP6 historical':['historical','esm-hist','historical-ext','esm-hist-ext'],
-               'control':['piControl','esm-piControl']}
+               'control':['piControl','esm-piControl'], 'AMIP':['amip'], 'abrupt4xCO2':'abrupt-4xCO2' }
 deckExptMapStar = {'CMIP6 historical':['historical','historical-ext'],
                'control':['piControl']}
@@ -413 +413 @@
       if expt in deckExptMap or string.find( expt, ',' ) != -1 or (string.find( expt, ' ' ) != -1 and expt != "CMIP6 historical"):
         il = list(i)
+        print 'INFO.expt.01001: %s, %s' % (expt, str(il) )
         if expt in deckExptMap:
-          if i[-1][-2:] == '**':
+          if type(i[-1]) in [type(''),type(u'')] and i[-1][-2:] == '**':
             il[-1] = i[-1][:-2]
             bits = deckExptMapStar[expt]
@@ -421 +422 @@
         else:
           bits = map( lambda x: string.strip(x), string.split( expt, ',' ) )
-        print 'INFO.expt.00006: ',i[:3], bits
+        print 'INFO.expt.00006: ',il, bits
         for b in bits:
           il[2] = b