Changeset 64 for FCC2

Timestamp:

02/10/13 19:19:37 (7 years ago)

Author:

mjuckes

Message:

adapted for SPECS

File:

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

FCC2/trunk/source/comp_mip.py

@@ -5 +5 @@
 ml = ['CORDEX_3h', 'CORDEX_6h', 'CORDEX_fx', 'CORDEX_day', 'CORDEX_mon', 'CORDEX_sem' ]
 ml = ['CCMI1_Amon_v1_complete']
+ml = ['SPECS_Amon', 'SPECS_fx', 'SPECS_Lmon', 'SPECS_Omon', 'SPECS_6hrLev', 'SPECS_day', 'SPECS_OImon']
 newMip = 'CCMI'
+newMip = 'SPECS'
 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'] 
@@ -110 +112 @@
                 nmm.append(k2)
           if ne1 > 0:
-                print 'ERROR[4A]: Anomaly bewteen MIP tables: %s:: %s ' % (k, str(nmm) )
+                print 'ERROR[4A]: Anomaly between MIP tables: %s:: %s ' % (k, str(nmm) )
           else:
              if not suppress4B:
-                print 'ERROR[4B]: Anomaly bewteen MIP tables: %s:: %s -- %s [%s]' % (k, str(e1[k][1]), str( e2[k][1] ), vrln )
+                print 'ERROR[4B]: Anomaly between MIP tables: %s:: %s -- %s [%s]' % (k, str(e1[k][1]), str( e2[k][1] ), vrln )
           e0 = 1
         else:
@@ -138 +140 @@
         
 base='/home/users/prototype/cordex/exarch/FCC2/trunk/work/'
+base='/home/martin/2013/mipML/FCC2/trunk/work/'
 snl,snla = gen_sn_list( base + cfsntab )
 print 'Len snl = %s' % len(snl)
@@ -203 +206 @@
 mpat = 'CORDEX_%s'
 newMipDir = '/ccmi_vocabs/mip/'
+newMipDir = '/specs_vocabs/mip/'
 mpat = 'CCMI1_%s_v1_complete'
+mpat = 'SPECS_%s'
 def validate( t,cc ):
   if t == 'all':
@@ -224 +229 @@
 tlist = ['3hr','6hr','day','mon','sem','fx']
 tlist = ['Amon']
+tlist = ['Amon', 'fx', 'Lmon', 'Omon', '6hrLev', 'day', 'OImon']
 for tab in tlist:
   ms = mipTableScan()
   print 'Validating table %s ' % tab
-  if newMip == 'CCMI':
+  if newMip in ['CCMI','SPECS']:
     ec1 = None
   else: