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

Timestamp:

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

Author:

mjuckes

Message:

release candidate

File:

• CMIP6dreqbuild/trunk/src/framework/audit.py (modified) (5 diffs)

CMIP6dreqbuild/trunk/src/framework/audit.py

@@ -370 +370 @@
     nrem = 0
     snm = set()
+    snmm = collections.defaultdict( int )
     for i in self.dq.coll['var'].items:
       if 'CMORvar' in self.dq.inx.iref_by_sect[i.uid].a:
@@ -376 +377 @@
           if 'requestVar' in self.dq.inx.iref_by_sect[u].a:
             for uu in self.dq.inx.iref_by_sect[u].a['requestVar']:
-              srq.add( uu )
+              rqv = self.dq.inx.uid[uu]
+              srq.add( rqv.priority )
         if len(srq) > 0:
+          pm = min( srq )
            
           kk = i.sn
@@ -383 +386 @@
             nrem += 1
             snm.add(kk)
+            if pm == 1:
+              print 'MISSING STANDARD NAME: ',i.label, i.title, i.sn
+            snmm[pm] += 1
           if i.procnote != []:
             ll = sorted( i.procnote )
@@ -388 +394 @@
           cc[kk].append( i.uid )
 
-    log.warn( 'sn.001: Number of missing standard names: %s [for %s variables]' % (len(snm),nrem) )
+    log.warn( 'sn.001: Number of missing standard names: %s [for %s variables] {%s}' % (len(snm),nrem,str(snmm)) )
     ll = []
     for k in cc:
@@ -436 +442 @@
       
   def audit_rqv(self):
-    ii = [i for i in self.dq.coll['requestVar'].items if self.dq.inx.uid[i.vid]._h.label == 'remarks']
+    ixx = [i for i in self.dq.coll['requestVar'].items if i.vid in self.dq.inx.uid]
+    if len(ixx) < len( self.dq.inx.uid ):
+       log.error( 'SEVERE.var.00301: request vars with bad links ....' )
+    
+    ii = [i for i in ixx if self.dq.inx.uid[i.vid]._h.label == 'remarks']
     ii2 = [i for i in ii if i.label not in self.cc]
     ii3 = [i.vgid for i in ii if self.dq.inx.uid[i.vgid]._h.label != 'remarks']