Changeset 560


Ignore:
Timestamp:
25/01/16 08:37:32 (3 years ago)
Author:
mjuckes
Message:

fixed ccmi bug --- failure to deal with day table split into two files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/utils_c4.py

    r428 r560  
    551551    self.checkId = ('002','variable_in_group') 
    552552 
     553     
    553554    self.test( varAts.has_key( varName ), 'Expected variable [%s] not present' % varName, abort=True, part=True ) 
    554555    msg = 'Variable %s not in table %s' % (varName,varGroup) 
     556     
    555557    self.test( vocabs['variable'].isInTable( varName, varGroup ), msg, abort=True, part=True ) 
    556558 
     
    10031005     self.varcons = {} 
    10041006     for f in tl: 
     1007        print 'INGESTING %s' % f 
    10051008        vg = vgmap.get( f, f ) 
    1006         self.varcons[vg] = {} 
     1009        if vg not in self.varcons: 
     1010          self.varcons[vg] = {} 
    10071011        fn = fnpat % f 
    10081012        ll = open( '%s%s' % (dir,fn) ).readlines() 
     
    10211025          self.varInfo[v] = {'ar':ar, 'ac':ac } 
    10221026          self.varcons[vg][v] = eeee 
     1027        if f == 'daily': 
     1028          print sorted( ee.keys() ) 
    10231029             
    10241030  def dummyMipTable(self): 
     
    10831089    if vg == 'ESA': 
    10841090      vg = 'ESACCI' 
     1091    print 'isInTable:',v,vg1 
     1092    for k in self.varcons: 
     1093      print k, sorted( self.varcons[k].keys() ) 
     1094    
    10851095    assert vg in self.varcons.keys(), '%s not found in  self.varcons.keys() [%s]' % (vg,str(self.varcons.keys()) ) 
    10861096    return (v in self.varcons[vg].keys()) 
Note: See TracChangeset for help on using the changeset viewer.