Changeset 242

Timestamp:

22/10/14 21:18:42 (5 years ago)

Author:

astephen

Message:

bugs in CCMI configuration fixed

Location:

CCCC/trunk/ceda_cc

Files:

• c4.py (modified) (2 diffs)
• config_c4.py (modified) (2 diffs)

CCCC/trunk/ceda_cc/c4.py

@@ -41 +41 @@
                  '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/', \
                  'CMIP5':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(table)s/%(ensemble)s/files/%%(version)s/%(variable)s/', \
+                 'CCMI':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(table)s/%(ensemble)s/files/%%(version)s/%(variable)s/', \
                  '__def__':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(variable)s/%(ensemble)s/files/%%(version)s/', \
                }
@@ -74 +75 @@
     assert self.type == 'map','Can only do map files at present'
     assert type(drs) == type( {} ), '2nd user argument to method add should be a dictionary [%s]' % type(drs)
+    print drs.keys()
     tpath = self.pathTmpl % drs
     if not self.dummy:

CCCC/trunk/ceda_cc/config_c4.py

@@ -241 +241 @@
       lrdr = readVocab( 'ccmi_vocabs/')
       self.requiredGlobalAttributes = [ 'creation_date', 'tracking_id', 'forcing', 'model_id', 'parent_experiment_id', 'parent_experiment_rip', 'branch_time', 'contact', 'institute_id' ]
-      self.requiredGlobalAttributes = lrdr.getSimpleList( 'globalAts.txt' )
+      self.requiredGlobalAttributes = lrdr.getSimpleList( 'globalAts.txt', bit=0 )
       self.controlledGlobalAttributes = [ 'experiment_id', 'project', 'frequency' ]
       self.globalAttributesInFn = [None,'@mip_id','model_id','experiment_id','@ensemble']
       self.requiredVarAttributes = ['long_name', 'standard_name', 'units']
-      self.drsMappings = {'variable':'@var'}
+      self.drsMappings = {'variable':'@var', 'institute':'institute_id', 'product':'product', 'experiment':'experiment_id', \
+                        'ensemble':'@ensemble', 'model':'model_id', 'realm':'modeling_realm', \
+                        'frequency':'frequency',  'table':'@mip_id',
+                        'project':'project_id'}
 
     elif project == '__dummy':
@@ -329 +332 @@
        self.mipVocabTl = ['fixed','annual','monthly','daily','hourly']
        self.mipVocabVgmap = {'fixed':'fx','annual':'yr','monthly':'mon','daily':'day','hourly':'hr'}
-       self.mipVocabFnpat = 'CCMI1_%s.txt'
+       self.mipVocabFnpat = 'CCMI1_%s'
     else:
        self.mipVocabDir = None