Changeset 63 for FCC2

Timestamp:

02/10/13 18:52:44 (7 years ago)

Author:

mjuckes

Message:

comp_mip update for CCMI

File:

• FCC2/trunk/source/comp_mip.py (modified) (9 diffs)

FCC2/trunk/source/comp_mip.py

@@ -1 @@
-
 from fcc_utils import mipTableScan
 import re, os, string
@@ -5 +4 @@
 ml = ['CORDEX_3h', 'CORDEX_6h', 'CORDEX_Aday', 'CORDEX_day', 'CORDEX_grids', 'CORDEX_mon' ]
 ml = ['CORDEX_3h', 'CORDEX_6h', 'CORDEX_fx', 'CORDEX_day', 'CORDEX_mon', 'CORDEX_sem' ]
+ml = ['CCMI1_Amon_v1_complete']
+newMip = 'CCMI'
 ml2 = ['CMIP5_3hr', 'CMIP5_6hrPlev', 'CMIP5_Amon', 'CMIP5_cfDay', 'CMIP5_cfOff', 'CMIP5_day', 'CMIP5_grids', 'CMIP5_Lmon', 'CMIP5_OImon', 'CMIP5_Oyr',
        'CMIP5_6hrLev', 'CMIP5_aero', 'CMIP5_cf3hr', 'CMIP5_cfMon', 'CMIP5_cfSites', 'CMIP5_fx', 'CMIP5_LImon', 'CMIP5_Oclim', 'CMIP5_Omon'] 
@@ -65 +66 @@
       f3 = False
       f4 = False
-      if e1[k][1]['standard_name'] not in self.snl:
+      if e1[k][1]['standard_name'] in [None,'None']:
+        print 'ERROR[A]: standard name for %s not set' % k
+      elif e1[k][1]['standard_name'] not in self.snl:
         if e1[k][1]['standard_name'] not in self.snla:
           print 'ERROR[0]: standard name %s for %s [%s] not in snl or snla' % (e1[k][1]['standard_name'], k, e1[k][2] )
         else:
           print 'WARNING: standard name %s for %s not in snl' % (e1[k][1]['standard_name'], k )
-      if k not in self.ec1.keys():
-        print 'ERROR[1]: variable %s [%s] not in CORDEX variable requirements list' % (k,e1[k][2])
-        vrln = None
-      else:
-        vrln = self.ec1[k][1]
-        if e1[k][1]['long_name'] != self.ec1[k][1]:
-          f2 = True
-        if checkCellMethods:  
-          if e1[k][1]['cell_methods'] != self.ec1[k][3]:
-            if not (e1[k][1]['cell_methods']=="None" and string.strip(self.ec1[k][3]) == "time:"):
-              f3 = True
-        if checkAll:  
-          if (e1[k][1].has_key( 'positive' ) and self.ec1[k][4] == '') or ( (not e1[k][1].has_key( 'positive' )) and self.ec1[k][4] != ''):
-              f4 = True
-          elif e1[k][1].has_key( 'positive' ):
-            if e1[k][1]['positive'] != self.ec1[k][4]:
-              if not (e1[k][1]['positive']=="None" and string.strip(self.ec1[k][4]) == ""):
+      if self.ec1 != None:
+        if k not in self.ec1.keys():
+          print 'ERROR[1]: variable %s [%s] not in CORDEX variable requirements list' % (k,e1[k][2])
+          vrln = None
+        else:
+          vrln = self.ec1[k][1]
+          if e1[k][1]['long_name'] != self.ec1[k][1]:
+            f2 = True
+          if checkCellMethods:  
+            if e1[k][1]['cell_methods'] != self.ec1[k][3]:
+              if not (e1[k][1]['cell_methods']=="None" and string.strip(self.ec1[k][3]) == "time:"):
+                f3 = True
+          if checkAll:  
+            if (e1[k][1].has_key( 'positive' ) and self.ec1[k][4] == '') or ( (not e1[k][1].has_key( 'positive' )) and self.ec1[k][4] != ''):
                 f4 = True
-          if (e1[k][1].has_key( 'modeling_realm' ) and self.ec1[k][5] == '') or ( (not e1[k][1].has_key( 'modeling_realm' )) and self.ec1[k][5] != ''):
-              f4 = True
-          elif e1[k][1].has_key( 'modeling_realm' ):
-            if e1[k][1]['modeling_realm'] != self.ec1[k][5]:
-              if not (e1[k][1]['modeling_realm']=="None" and string.strip(self.ec1[k][5]) == ""):
+            elif e1[k][1].has_key( 'positive' ):
+              if e1[k][1]['positive'] != self.ec1[k][4]:
+                if not (e1[k][1]['positive']=="None" and string.strip(self.ec1[k][4]) == ""):
+                  f4 = True
+            if (e1[k][1].has_key( 'modeling_realm' ) and self.ec1[k][5] == '') or ( (not e1[k][1].has_key( 'modeling_realm' )) and self.ec1[k][5] != ''):
                 f4 = True
+            elif e1[k][1].has_key( 'modeling_realm' ):
+              if e1[k][1]['modeling_realm'] != self.ec1[k][5]:
+                if not (e1[k][1]['modeling_realm']=="None" and string.strip(self.ec1[k][5]) == ""):
+                  f4 = True
         
       cks = ['units', 'long_name', 'standard_name']
@@ -100 +104 @@
         if e1[k][1] != e2[k][1]:
           ne1 = 0
+          nmm = []
           for k2 in cks:
              if e1[k][1][k2] != e2[k][1][k2]:
-                ne1 += 0
+                ne1 += 1
+                nmm.append(k2)
           if ne1 > 0:
-                print 'ERROR[4A]: Anomaly bewteen MIP tables: %s:: %s -- %s [%s]' % (k, str(e1[k][1]), str( e2[k][1] ), vrln )
+                print 'ERROR[4A]: Anomaly bewteen MIP tables: %s:: %s ' % (k, str(nmm) )
           else:
              if not suppress4B:
@@ -110 +116 @@
           e0 = 1
         else:
-          ## print '%s OK -- %s -- %s' % (k,str(e1[k][1]), str( e2[k][1] ) )
+          ##print '%s OK -- %s -- %s' % (k,str(e1[k][1]), str( e2[k][1] ) )
           e0 = 2
       else:
-        ## print '%s not in table 2' % k
+        ##print '%s not in table 2' % k
         e0 = 3
 
@@ -119 +125 @@
       if self.tag != None:
          xxx += '[%s]' % self.tag
-      if f2 and (e0 == 2):
-         print 'ERROR[2]: Difference between CORDEX/CMIP5 MIP tables and VR: %s:: %s [%s] --- %s' % (k,e1[k][1]['long_name'],e1[k][2], self.ec1[k][1])
-      elif f2 and (e0 == 3):
-         print 'ERROR[3]: Difference between CORDEX MIP tables and VR: %s:: %s [%s] --- %s' % (k,e1[k][1]['long_name'],e1[k][2], self.ec1[k][1])
-      elif f2:
-         print 'ERROR[5]: Difference between CORDEX MIP tables and VR %s: %s --- %s' % (xxx,e1[k][1]['long_name'], self.ec1[k][1])
-      if f3:
-         print 'ERROR[6]: Difference between CORDEX MIP tables and VR in cell_methods: %s:: %s --- %s' % (k,e1[k][1]['cell_methods'], self.ec1[k][3])
-      if f4:
-         print 'ERROR[7]: Difference between CORDEX MIP tables and VR in positive, realm: %s:: %s,%s --- %s' % (xxx,e1[k][1].get('positive','None'),e1[k][1].get('modeling_realm','None'), self.ec1[k][4:6])
+      if self.ec1 != None:
+        if f2 and (e0 == 2):
+           print 'ERROR[2]: Difference between CORDEX/CMIP5 MIP tables and VR: %s:: %s [%s] --- %s' % (k,e1[k][1]['long_name'],e1[k][2], self.ec1[k][1])
+        elif f2 and (e0 == 3):
+           print 'ERROR[3]: Difference between CORDEX MIP tables and VR: %s:: %s [%s] --- %s' % (k,e1[k][1]['long_name'],e1[k][2], self.ec1[k][1])
+        elif f2:
+           print 'ERROR[5]: Difference between CORDEX MIP tables and VR %s: %s --- %s' % (xxx,e1[k][1]['long_name'], self.ec1[k][1])
+        if f3:
+           print 'ERROR[6]: Difference between CORDEX MIP tables and VR in cell_methods: %s:: %s --- %s' % (k,e1[k][1]['cell_methods'], self.ec1[k][3])
+        if f4:
+           print 'ERROR[7]: Difference between CORDEX MIP tables and VR in positive, realm: %s:: %s,%s --- %s' % (xxx,e1[k][1].get('positive','None'),e1[k][1].get('modeling_realm','None'), self.ec1[k][4:6])
         
-
 base='/home/users/prototype/cordex/exarch/FCC2/trunk/work/'
 snl,snla = gen_sn_list( base + cfsntab )
 print 'Len snl = %s' % len(snl)
-
 
 dkrz_cordex_version = 3
@@ -195 +200 @@
      eeee[tab] = ee
 
-
-
+newMipDir = '/cordex_vocabs/mip/'
+mpat = 'CORDEX_%s'
+newMipDir = '/ccmi_vocabs/mip/'
+mpat = 'CCMI1_%s_v1_complete'
 def validate( t,cc ):
   if t == 'all':
@@ -202 +209 @@
     l2 = {}
     for m in ml:
-      l1 = ms.scan_table( open( base + '/cordex_vocabs/mip/' + m ).readlines(), None, asDict=True, appendTo=l1, lax=True, tag=m)
+      l1 = ms.scan_table( open( base + newMipDir + m ).readlines(), None, asDict=True, appendTo=l1, lax=True, tag=m)
     for m in ml2:
       l2 = ms.scan_table( open( base + '/cmip5_vocabs/mip/' + m ).readlines(), None, asDict=True, appendTo=l2, lax=True, tag=m)
@@ -211 +218 @@
       l2 = ms.scan_table( open( base + '/cmip5_vocabs/mip/' + m ).readlines(), None, asDict=True, appendTo=l2, lax=True, tag=m)
     k = { '3hr':'3h', '6hr':'6h' }.get( t,t )
-    l1 = ms.scan_table( open( base + '/cordex_vocabs/mip/CORDEX_%s' % k ).readlines(), None, asDict=True)
+    l1 = ms.scan_table( open( base + newMipDir + mpat % k ).readlines(), None, asDict=True)
     ccm = True
-
   cc.comp( l1, l2, checkCellMethods=ccm, tag=t )
 
-for tab in ['3hr','6hr','day','mon','sem','fx']:
+tlist = ['3hr','6hr','day','mon','sem','fx']
+tlist = ['Amon']
+for tab in tlist:
   ms = mipTableScan()
   print 'Validating table %s ' % tab
-  print eeee[tab].keys()
-  c = comp( snl,snla=snla, ec1=eeee[tab])
+  if newMip == 'CCMI':
+    ec1 = None
+  else:
+    ec1=eeee[tab]
+    print eeee[tab].keys()
+  c = comp( snl,snla=snla, ec1=ec1)
   validate(tab,c)
-