Changeset 48 for FCC2

Timestamp:

16/07/13 16:35:53 (6 years ago)

Author:

mjuckes

Message:

correcting time constraints for partial time segments

Location:

FCC2/trunk

Files:

• source/comp_mip.py (added)
• source/fcc_utils.py (modified) (8 diffs)
• source/run_fcc.py (modified) (1 diff)
• work/cordex_vocabs/cordex_time_constraints.txt (modified) (1 diff)

FCC2/trunk/source/fcc_utils.py

@@ -1 +1 @@
 import string, os, re, stat
 
+ncdumpCmd = 'ncdump'
 ncdumpCmd = '/usr/local/5/bin/ncdump'
-ncdumpCmd = 'ncdump'
 ##
 
@@ -8 +8 @@
 class mipTableScan:
 
-  def __init__(self, vats = ['standard_name','long_name','units'] ):
+  def __init__(self, vats = ['standard_name','long_name','units','cell_methods'] ):
     self.vats = vats
     self.re_cmor_mip2 = re.compile( 'dimensions:(?P<dims>.*?):::' )
@@ -15 +15 @@
       self.re_vats[v] = re.compile( '%s:(?P<dims>.*?):::' % v )
 ##
-  def scan_table(self,ll,log):
+  def scan_table(self,ll,log,asDict=False,appendTo=None,lax=False,tag=None):
  
     lll = map( string.strip, ll )
@@ -43 +43 @@
         ds = mm
         raise 'Mistake?? in scan_table %s' % str(mm)
-      ee.append( (var,ds,aa) )
-    return tuple( ee )
+      ee.append( (var,ds,aa,tag) )
+    if not asDict:
+      return tuple( ee )
+    else:
+      ff = {}
+      for l in ee:
+        ff[l[0]] = ( l[1], l[2], l[3] )
+      if appendTo != None:
+        for k in ff.keys():
+          if appendTo.has_key(k):
+            if lax and  ff[k][1]['standard_name'] != appendTo[k][1]['standard_name']:
+              print 'ERROR[X1]: Inconsistent entry definitions %s:: %s [%s] --- %s [%s]' % (k,ff[k][1],ff[k][2], appendTo[k][1], appendTo[k][2])
+            if not lax:
+              assert ff[k][1] == appendTo[k][1], 'Inconsistent entry definitions %s:: %s [%s] --- %s [%s]' % (k,ff[k][1],ff[k][2], appendTo[k][1], appendTo[k][2])
+          else:
+            appendTo[k] = ff[k]
+        return appendTo
+      else:
+        return ff
 ##
 ## this class carries a logging method, and is used to carry information about datasets being parsed.
@@ -248 +265 @@
                         ##print '_arg_%s' % key , locals()['_arg_%s' % key ]
                       res = eval( tt1 )
-                      ##print res,tt1
+                      print '#####', res,tt1
                       if res:
                         match = True
@@ -1038 +1055 @@
 #### Mip table variable attribute check
 
+class Constraint__VarDimsCordexHardWired:
+  def __init__(self, attribVocabs,  kpat, keys, logger=None):
+     self.code = 'CQC.102.002.010'
+     self.name = 'VarAtts'
+     self.tables = {}
+     self.keys = keys
+     self.kpat = kpat
+     self.logger = logger
+     self.plev_vars = ['clh','clm','cll','ua850','va850']
+
 class Constraint__VarAtts:
 
@@ -1072 +1099 @@
   def __check( self, mip, var, fns ):
      ms = ''
+     self.log( 'i', 'CHECKING %s' % var )
      nf = 0
      if not self.tables[mip].has_key(var):
@@ -1078 +1106 @@
        return ('FAIL', self.msg)
      assert fns.has_key( 'v_%s' % var ), 'Internal error: attempt to check variable %s which is not in fns' % var
+     mip_dims, mip_ats = self.tables[mip][var]
+     var_dims = fns['v_%s' % var ][0]
      for k in self.keys:
-        if self.tables[mip][var][1][k] != fns['v_%s' % var ][1][k]:
-           self.log( 'w', 'Variable attribute mismatch: %s -- %s' % (self.tables[mip][var][1][k], str(fns['v_%s' % var ]) ) )
+        if mip_ats[k] != fns['v_%s' % var ][1][k]:
+           self.log( 'w', 'Variable attribute mismatch: %s -- %s' % (mip_ats[k], str(fns['v_%s' % var ]) ) )
            nf += 1
            ms += '%s; ' % k
         else:
            self.log( 'i', 'Attribute OK: %s' % (self.tables[mip][var][1][k]) )
+
+     # unclear how to proceed here -- want to check, e.g., time dimension.  -- possibly easiest to have a CORDEX_SPECIAL flag for some ad hoc code..
+     # ideally get axis information from "axis_entry" in mip tables -- need to improve the scanner for this.
+     ##print 'DIMS:  %s -- %s -- %s' % (var, str(mip_dims), str(var_dims))
      if nf > 0:
        if nf == 1:

FCC2/trunk/source/run_fcc.py

@@ -75 +75 @@
 
         baseDir = thisDir
-        scriptVersion = 0.7
+        scriptVersion = 0.8
         scriptName = 'run_fcc'
 

FCC2/trunk/work/cordex_vocabs/cordex_time_constraints.txt

@@ -1 @@
-mon: {$e==$d+1}'(?P<d>[0-9]{3})101-(?P<e>[0-9]{3})012' '(?P<startyear>[0-9]{4})[0-9]{2}-(?P<e>[0-9]{3}0)12' '%(startyear)s[0-9]{2}-(?P<e>[0-9]{3}0)12' '(?P<d>[0-9]{3})101-%(endyear)s[0-9]{2}'
-sem: '(?P<d>[0-9]{3})012-(?P<e>[0-9]{3})011' '%(startyear)s(12|03|06|09)-(?P<e>[0-9]{3}0)11'  '(?P<d>[0-9]{3})012-(?P<e>%(endyear)s)(11|02|05|08)'
-day: {$e==$d+1}'(?P<d>[0-9]{3})60101-(?P<e>[0-9]{3})012%(enddec)s' {$e==$d}'(?P<d>[0-9]{3})10101-(?P<e>[0-9]{3})512%(enddec)s' {$e<=$startyear+4}'(?P<startyear>[0-9]{4})(?P<d1>[0-9]{4})-(?P<e>[0-9]{3}(0|5))12%(enddec)s' {$d1<=$s+4}'(?P<s>%(startyear)s)(?P<d1>[0-9]{4})-(?P<e>[0-9]{3}(0|5))12%(enddec)s'  {$e==$d+1}'(?P<d>[0-9]{3})(1|6)0101-(?P<e>%(endyear)s)(?P<d1>[0-9]{4})'
-3hr,6hr: '(?P<d>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' '%(startyear)s(?P<h1>[0-9]{6})-%(startyear)s12%(enddec)s(?P<h2>[0-9]{2})' '%(endyear)s0101(?P<h1>[0-9]{2})-%(endyear)s(?P<h2>[0-9]{6})'
+mon: {$e==$d+1}'(?P<d>[0-9]{3})101-(?P<e>[0-9]{3})012' '(?P<startyear>[0-9]{4})[0-9]{2}-(?P<e>[0-9]{3}0)12' '(?P<d>[0-9]{3})101-?P<endyear>[0-9]{4}[0-9]{2}'
+sem: '(?P<d>[0-9]{3})012-(?P<e>[0-9]{3})011' '(?P<startyear>[0-9]{4})(12|03|06|09)-(?P<e>[0-9]{3}0)11'  '(?P<d>[0-9]{3})012-(?P<endyear>[0-9]{4})(11|02|05|08)'
+day: {$e==$d+1}'(?P<d>[0-9]{3})60101-(?P<e>[0-9]{3})012%(enddec)s' {$e==$d}'(?P<d>[0-9]{3})10101-(?P<e>[0-9]{3})512%(enddec)s' {$e<=$startyear+4}'(?P<startyear>[0-9]{4})(?P<d1>[0-9]{4})-(?P<e>[0-9]{3}(0|5))12%(enddec)s' {$d1<=$startyear+4}'(?P<startyear>[0-9]{4})(?P<d1>[0-9]{4})-(?P<e>[0-9]{3}(0|5))12%(enddec)s'  {$endyear<=$d+5}'(?P<d>[0-9]{3}(1|6))0101-(?P<endyear>[0-9]{4})(?P<d1>[0-9]{4})'
+3hr,6hr: '(?P<d>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' {$s=$startyear}'(?P<startyear>[0-9]{4})(?P<h1>[0-9]{6})-(?P<s>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' {$e==$endyear}'(?P<endyear>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})(?P<h2>[0-9]{6})'