Changeset 242 for CCCC


Ignore:
Timestamp:
22/10/14 21:18:42 (6 years ago)
Author:
astephen
Message:

bugs in CCMI configuration fixed

Location:
CCCC/trunk/ceda_cc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/c4.py

    r236 r242  
    4141                 'SPECS':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(start_date)s/%(frequency)s/%(realm)s/%(table)s/%(variable)s/%(ensemble)s/files/%%(version)s/', \ 
    4242                 'CMIP5':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(table)s/%(ensemble)s/files/%%(version)s/%(variable)s/', \ 
     43                 'CCMI':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(table)s/%(ensemble)s/files/%%(version)s/%(variable)s/', \ 
    4344                 '__def__':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(variable)s/%(ensemble)s/files/%%(version)s/', \ 
    4445               } 
     
    7475    assert self.type == 'map','Can only do map files at present' 
    7576    assert type(drs) == type( {} ), '2nd user argument to method add should be a dictionary [%s]' % type(drs) 
     77    print drs.keys() 
    7678    tpath = self.pathTmpl % drs 
    7779    if not self.dummy: 
  • CCCC/trunk/ceda_cc/config_c4.py

    r232 r242  
    241241      lrdr = readVocab( 'ccmi_vocabs/') 
    242242      self.requiredGlobalAttributes = [ 'creation_date', 'tracking_id', 'forcing', 'model_id', 'parent_experiment_id', 'parent_experiment_rip', 'branch_time', 'contact', 'institute_id' ] 
    243       self.requiredGlobalAttributes = lrdr.getSimpleList( 'globalAts.txt' ) 
     243      self.requiredGlobalAttributes = lrdr.getSimpleList( 'globalAts.txt', bit=0 ) 
    244244      self.controlledGlobalAttributes = [ 'experiment_id', 'project', 'frequency' ] 
    245245      self.globalAttributesInFn = [None,'@mip_id','model_id','experiment_id','@ensemble'] 
    246246      self.requiredVarAttributes = ['long_name', 'standard_name', 'units'] 
    247       self.drsMappings = {'variable':'@var'} 
     247      self.drsMappings = {'variable':'@var', 'institute':'institute_id', 'product':'product', 'experiment':'experiment_id', \ 
     248                        'ensemble':'@ensemble', 'model':'model_id', 'realm':'modeling_realm', \ 
     249                        'frequency':'frequency',  'table':'@mip_id', 
     250                        'project':'project_id'} 
    248251 
    249252    elif project == '__dummy': 
     
    329332       self.mipVocabTl = ['fixed','annual','monthly','daily','hourly'] 
    330333       self.mipVocabVgmap = {'fixed':'fx','annual':'yr','monthly':'mon','daily':'day','hourly':'hr'} 
    331        self.mipVocabFnpat = 'CCMI1_%s.txt' 
     334       self.mipVocabFnpat = 'CCMI1_%s' 
    332335    else: 
    333336       self.mipVocabDir = None 
Note: See TracChangeset for help on using the changeset viewer.