Changeset 299

Timestamp:

27/02/15 15:22:13 (6 years ago)

Author:

mjuckes

Message:

added SPECS drsMappings file

Location:

CCCC/trunk/ceda_cc

Files:

• config/specs_vocabs/drsMappings_sv0101.txt (added)
• config/specs_vocabs/validInstitutions_sv0101.txt (added)
• config_c4.py (modified) (2 diffs)

CCCC/trunk/ceda_cc/config_c4.py

@@ -209 +209 @@
       self.requiredGlobalAttributes = lrdr.driver( ('simpleList', 'globalAts.txt' ) )
       self.exptFamilies = lrdr.driver( ('simpleList', 'exptFamily.txt', 0 ) )
+      self.validInstitutions = lrdr.driver( ('simpleList', 'validInstitutions_sv0101.txt' ) )
+      self.realm = lrdr.driver( ('simpleList', 'realm_sv0101.txt' ) )
       self.controlledGlobalAttributes = lrdr.driver( ('simpleList', 'controlledGlobalAttributes_sv0101.txt' ) )
                        ##'initialization_method','physics_version','realization']
-      self.globalAttributesInFn = lrdr.driver( ('simpleList', 'globalAttributesInFn_sv0101.txt',0,0,'noneMap' ) )
+      self.globalAttributesInFn = lrdr.driver( ('simpleList', 'globalAttributesInFn_sv0101.txt',None,None,'noneMap' ) )
       self.requiredVarAttributes = ['long_name', 'standard_name', 'units']
-      oo, self.drsMappings = lrdr.driver( ('simpleList', 'drsMappings_sv0101.txt',0,0,'returnMappings' ) )
+      oo, self.drsMappings = lrdr.driver( ('simpleList', 'drsMappings_sv0101.txt',0,None,'returnMappings' ) )
 
       ##self.drsMappings = {'variable':'@var', 'institute':'institute_id', 'product':'product', 'experiment':'experiment_id', \
@@ -400 +402 @@
                'project_id':utils.listControl( 'project_id', ['SPECS', 'NMME-SPECS'] ), \
                ## 'institution':utils.listControl( 'institution', validSpecsInstitutions ), \
-               'modeling_realm':utils.listControl( 'realm', ['atmos', 'ocean', 'land', 'landIce', 'seaIce', 'aerosol', 'atmosChem', 'ocnBgchem'], split=True ), \
+               'modeling_realm':utils.listControl( 'realm', self.realm, split=True ), \
              }
     elif self.projectV.id == 'CMIP5':