Ignore:
Timestamp:
30/11/16 10:00:03 (3 years ago)
Author:
mjuckes
Message:

added key VIACSAB integration code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/ingest/dreq_consol_dreq2.py

    r878 r884  
    1515 
    1616deckExptMap = {'CMIP6 historical':['historical','esm-hist','historical-ext','esm-hist-ext'], 
    17                'control':['piControl','esm-piControl']} 
     17               'control':['piControl','esm-piControl'], 'AMIP':['amip'], 'abrupt4xCO2':'abrupt-4xCO2' } 
    1818deckExptMapStar = {'CMIP6 historical':['historical','historical-ext'], 
    1919               'control':['piControl']} 
     
    413413      if expt in deckExptMap or string.find( expt, ',' ) != -1 or (string.find( expt, ' ' ) != -1 and expt != "CMIP6 historical"): 
    414414        il = list(i) 
     415        print 'INFO.expt.01001: %s, %s' % (expt, str(il) ) 
    415416        if expt in deckExptMap: 
    416           if i[-1][-2:] == '**': 
     417          if type(i[-1]) in [type(''),type(u'')] and i[-1][-2:] == '**': 
    417418            il[-1] = i[-1][:-2] 
    418419            bits = deckExptMapStar[expt] 
     
    421422        else: 
    422423          bits = map( lambda x: string.strip(x), string.split( expt, ',' ) ) 
    423         print 'INFO.expt.00006: ',i[:3], bits 
     424        print 'INFO.expt.00006: ',il, bits 
    424425        for b in bits: 
    425426          il[2] = b 
Note: See TracChangeset for help on using the changeset viewer.