Changeset 885 for CMIP6dreqbuild/trunk/src/framework/appendViacs_p1.py

Timestamp:

02/12/16 18:08:59 (3 years ago)

Author:

mjuckes

Message:

release candidate

File:

• CMIP6dreqbuild/trunk/src/framework/appendViacs_p1.py (modified) (7 diffs)

CMIP6dreqbuild/trunk/src/framework/appendViacs_p1.py

@@ -1 +1 @@
 import string, xlrd, os, collections, uuid
 from dreqPy import dreq
-
-
 
 class workbook(object):
@@ -20 +18 @@
 ccvg = collections.defaultdict( list )
 ccd2 = collections.defaultdict( dict )
+ccmt = collections.defaultdict( dict )
 
 dq = dreq.loadDreq()
+
+for i in dq.coll['miptable'].items:
+  for u in dq.inx.iref_by_sect[i.uid].a['CMORvar']:
+    cmv = dq.inx.uid[u]
+    ccmt[i.label][cmv.label] = u
 
 for i in dq.coll['CMORvar'].items:
@@ -76 +80 @@
               ccvg[ obj1[j] + '.' + b[0] + sfx ].append( ('ln',i,rr[2]) )
             elif b in ['3b']:
-              ccvg[ obj1[j] + '.' + b ].append( (i,rr[2]) )
+              ccvg[ obj1[j] + '.' + b ].append( ('ln',i,rr[2]) )
             else:
               sb.add(b)
@@ -115 +119 @@
   return i
 
-##i = scanSect2(i)
+i = scanSect2(i)
 
 ks = sorted( cc.keys() )
@@ -159 +163 @@
 
       cc0 = collections.defaultdict( int )
-      if k not in cmip5so.so:
-         print 'Key %s not found' % k
+      if k not in cmip5so.so and k0 != 'sect2':
+         print 'SEVERE: Key %s not found' % k
       else:
-         for t in cc[k0]:
-           if t[1] not in cc2[k].a:
-             print 'Long name %s:%s not found' % (k,t[1])
-           elif len( cc2[k].a[t[1]] ) == 2:
-             if ( cc2[k].a[t[1]][0] in cc2[k].a[t[1]][1] ) or ( cc2[k].a[t[1]][1] in cc2[k].a[t[1]][0] ):
-               print 'INFO: Probable option set %s, %s: %s' % ( k,t[1],str( cc2[k].a[t[1]] ) )
-               self.vmap3[t] = (k, cc2[k].a[t[1]][0], cc2[k].a[t[1]][1] )
+         for a,b,c in cc[k0]:
+           if a == 'ln':
+             t = (b,c)
+             if t[1] not in cc2[k].a:
+               print 'Long name %s:%s not found' % (k,t[1])
+             elif len( cc2[k].a[t[1]] ) == 2:
+               if ( cc2[k].a[t[1]][0] in cc2[k].a[t[1]][1] ) or ( cc2[k].a[t[1]][1] in cc2[k].a[t[1]][0] ):
+                 print 'INFO: Probable option set %s, %s: %s' % ( k,t[1],str( cc2[k].a[t[1]] ) )
+                 self.vmap3[t] = (k, cc2[k].a[t[1]][0], cc2[k].a[t[1]][1] )
+               else:
+                 print 'WARNING: Dual distinct targets %s, %s: %s' % ( k,t[1],str( cc2[k].a[t[1]] ) )
+             elif len( cc2[k].a[t[1]] ) > 1:
+               print 'WARNING: Multiple targets %s, %s: %s' % ( k,t[1],str( cc2[k].a[t[1]] ) )
              else:
-               print 'WARNING: Dual distinct targets %s, %s: %s' % ( k,t[1],str( cc2[k].a[t[1]] ) )
-           elif len( cc2[k].a[t[1]] ) > 1:
-             print 'WARNING: Multiple targets %s, %s: %s' % ( k,t[1],str( cc2[k].a[t[1]] ) )
+               kv = '%s.%s' % (cc2[k].a[t[1]][0],k)
+               if kv in s1:
+                 self.vmap[t] = (k, cc2[k].a[t[1]][0], s1[kv] )
+               else:
+                 print 'WARNING: dreq item not found ...%s, %s: %s' % ( k,t[1], cc2[k].a[t[1]][0] )
+                 self.vmapx[t] = (k, cc2[k].a[t[1]][0] )
            else:
-             kv = '%s.%s' % (cc2[k].a[t[1]][0],k)
-             if kv in s1:
-               self.vmap[t] = (k, cc2[k].a[t[1]][0], s1[kv] )
+              ## want table, var, uid
+             var, tab = c
+             if tab in ccmt and var in ccmt[tab]:
+               self.vmap[t] = (tab,var,ccmt[tab][var])
+               print 'INFO.var.00505: var found: %s: %s.%s: %s' % (a,tab,var,ccmt[tab][var])
              else:
-               print 'WARNING: dreq item not found ...%s, %s: %s' % ( k,t[1], cc2[k].a[t[1]][0] )
-               self.vmapx[t] = (k, cc2[k].a[t[1]][0] )
+               print 'ERROR.var.00505: var not found: %s: %s.%s' % (a,tab,var)
 
 class scanexpt(object):
@@ -288 +302 @@
   n1 = 0
   vgid = vguid[k]
-  for t in ccvg[k]:
+  for a,b,c in ccvg[k]:
+    t = (b,c)
     if t in scannedVars.vmap:
        n1 += 1
@@ -296 +311 @@
        oo.write( 'requestVar\t%s\t%s\t%s\t%s\t%s\n' % (uid,var,tab,vid,vgid) )
        res['requestVar'].append( (uid,var,tab,vid,vgid) )
-  print k,l1,n1
+    else:
+       print 'WARNING.var.0001: not found: %s.%s' % (b,c)
+  print 'VARGROUP: ',k,l1,n1
 
 ## request items