Changeset 155

Timestamp:

14/05/14 22:31:05 (6 years ago)

Author:

mjuckes

Message:

various fixes for aMap feature -- see updates.txt

Location:

CCCC/trunk

Files:

• c4.py (modified) (1 diff)
• config_c4.py (modified) (2 diffs)
• file_utils.py (modified) (1 diff)
• updates.txt (added)
• utils_c4.py (modified) (6 diffs)

CCCC/trunk/c4.py

@@ -28 +28 @@
 pathTmplDict = { 'CORDEX':'%(project)s/%(product)s/%(domain)s/%(institute)s/%(driving_model)s/%(experiment)s/%(ensemble)s/%(model)s/%(model_version)s/%(frequency)s/%(variable)s/files/%%(version)s/',   \
                  'SPECS':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s_%(series)s/%(start_date)s/%(frequency)s/%(realm)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/', \
                  '__def__':'%(project)s/%(product)s/%(institute)s/%(model)s/%(experiment)s/%(frequency)s/%(realm)s/%(variable)s/%(ensemble)s/files/%%(version)s/', \
                }

CCCC/trunk/config_c4.py

@@ -175 +175 @@
 
     self.project = project
+    self.gridSpecTol = 0.01
     if project == 'CORDEX':
       self.requiredGlobalAttributes = [ 'institute_id', 'contact', 'rcm_version_id', 'product', 'CORDEX_domain', 'creation_date', \
@@ -217 +218 @@
       self.drsMappings = {'variable':'@var', 'institute':'institute_id', 'product':'product', 'experiment':'experiment_id', \
                         'ensemble':'@ensemble', 'model':'model_id', 'realm':'modeling_realm', \
-                        'frequency':'frequency',  \
+                        'frequency':'frequency',  'table':'@mip_id',
                         'project':'project_id'}
 

CCCC/trunk/file_utils.py

@@ -236 +236 @@
                 log.info( 'Setting %s to %s' % (targ,m[2][1]) )
               ##print 'Setting %s:%s to %s' % (m[1][0][1],targ,m[2][1])
-              thisval = self.va[m[1][0][1]].get( targ, None )
+              thisval = self.da[m[1][0][1]].get( targ, None )
               self.da[m[1][0][1]][targ] = m[2][1]
               self.atMapLog.write( '@ax:"%s","%s","%s","%s","%s"\n' % (self.fpath, m[1][0][1], targ, thisval, m[2][1]) )

CCCC/trunk/utils_c4.py

@@ -324 +324 @@
         x = self.globalAts.get("forecast_reference_time",'yyyy-mm-dd Thh:mm:ssZ' )
         ee[k] = "%s%s%s" % (x[:4],x[5:7],x[8:10])
+      elif self.drsMappings[k] == '@mip_id':
+        ee[k] = string.split( self.globalAts["table_id"] )[1]
       else:
         ee[k] = self.globalAts[ self.drsMappings[k] ]
@@ -347 +349 @@
       if not globalAts.has_key(k):
          m.append(k)
+         self.globalAts[k] = '__errorReported__'
 
     if not self.test( len(m)  == 0, 'Required global attributes missing: %s' % str(m) ):
@@ -489 +492 @@
              thisVal = globalAts[self.globalAttributesInFn[i]]
 
-         if thisVal != targVal:
+         if thisVal not in [targVal,'__errorReported__']:
              m.append( (i,self.globalAttributesInFn[i]) )
 
@@ -667 +670 @@
           if atDict[k][k2] != da[k].get(k2, None ):
             mm.append( (k,k2) )
+            record = '#@ax=%s;%s=%s|%s=%s <uncomment if correct>' % (k,k2,da[k].get(k2, '__missing__'),k2,atDict[k][k2]   )
+            self.parent.amapListDraft.append( record )
       self.test( len(mm) == 0, 'Required attributes of grid coordinate arrays not correct: %s' % str(mm) )
 
@@ -681 +686 @@
       mm = []
       for i in range(4):
-        if a[i] != b[i]:
+        if abs(a[i] - b[i]) > self.pcfg.gridSpecTol:
           mm.append( (a[i],b[i]) )
 
-      ok &= self.test( len(mm) == 0, 'Domain boundaries for rotated pole grid do not match %s' % str(mm), part=True )
+      ok &= self.test( len(mm) == 0, 'Domain boundaries for rotated pole grid do not match %s within tolerance (%s)' % (str(mm),self.pcfg.gridSpecTol), part=True )
 
       for k in ['rlat','rlon']:
@@ -708 +713 @@
           if atDict[k][k2] != da[k].get(k2, None ):
             mm.append( (k,k2) )
+            record = '#@ax=%s;%s=%s|%s=%s <uncomment if correct>' % (k,k2,da[k].get(k2, '__missing__'),k2,atDict[k][k2]   )
+            self.parent.amapListDraft.append( record )
 
       self.test( len(mm) == 0,  'Required attributes of grid coordinate arrays not correct: %s' % str(mm), part=True )