Changeset 376 for CMIP6dreqbuild

Timestamp:

03/09/15 10:18:48 (7 years ago)

Author:

mjuckes

Message:

import of cmip5 standard output for priorities

Location:

CMIP6dreqbuild/trunk/srcMisc

Files:

• CMIP5_standard_output.xls (added)
• dreqSX.py (modified) (2 diffs)
• sx2.py (modified) (1 diff)

CMIP6dreqbuild/trunk/srcMisc/dreqSX.py

@@ -2 +2 @@
 import shelve, string, collections
 from utils_wb import workbook, uniCleanFunc
+import cmip5so
+from sets import Set
 
 vdate = "20150827"
@@ -110 +112 @@
   ee_byvar[ ee_mip[k][-3] ].append( k )
 
+## check cmip5 vs. standard output
+s1 = Set()
+for k in ee_miptables_vars_old.keys():
+  if k[:6] == 'CMIP5_':
+    s2 = Set( ee_miptables_vars_old[k] )
+    kk = k[6:]
+    s1.add( kk )
+    assert cmip5so.so.has_key(kk ), 'Table %s not found in standard output' % kk
+    lnf = []
+    for v in ee_miptables_vars_old[k]:
+      if not cmip5so.so[kk].a.has_key(v):
+         lnf.append(v)
+    if len(lnf) > 0:
+      print 'ERROR.010.0001: Variables not found in %s:: %s' % (kk,str(lnf))
+
+    lnf = []
+    for v in cmip5so.so[kk].a.keys():
+      if not v in s2:
+         lnf.append(v)
+    if len(lnf) > 0:
+      print 'ERROR.010.0002: SO Variables not found in %s:: %s' % (kk,str(lnf))
+
+for s in cmip5so.so.keys():
+  if not s in s1:
+    print 'ERROR.010.0002: Table %s not in old mip tables' % s
+
 for s in shlist:
   s.close()

CMIP6dreqbuild/trunk/srcMisc/sx2.py

@@ -480 +480 @@
 ## need to identify what is meant by group labels in "Request Scoping" -- now in eervg.keys()
 ##
-## 29th July: loosin some links for groups of revised table items ....
+## 29th July: loosing some links for groups of revised table items ....
 ##
 shb = shelve.open( 'dreq_consol_tables_reviewed_b_v20150708', 'r' )
 revisedTabKeys = shb.keys()
+revisedTabKeys.sort()
+revisedTabKeysff = []
+for r in revisedTabKeys:
+  if string.find( r, '.' ) != -1:
+    mip,tab = string.split(r, '.' )
+    assert sx.cmip5so.so.has_key(tab), 'FATAL.001.0001: revised table not found in original: %s' % tab
+    lnf = []
+    lpe = []
+    lmod = []
+    for v in shb[r].keys():
+      v1 = string.strip(v)
+      if not sx.cmip5so.so[tab].a.has_key(v1):
+        lnf.append(v)
+      else:
+        if shb[r][v][1] == sx.cmip5so.so[tab].a[v1][0]:
+          lpe.append(v)
+        else:
+          lmod.append(v)
+    if len(lnf) > 0:
+      print 'ERROR.008.0001: Revised variables not in original: %s %s' % (r,str(lnf) )
+    if len(lmod) == 0:
+      print 'INFO.008.0001: No modfications in %s' % r
+    else:
+      revisedTabKeysff.append( r )
+      
 shb.close()
-gpids = gpids + revisedTabKeys
+gpids = gpids + revisedTabKeysff
 ks = eervg.keys()
 ks.sort()