Ignore:
Timestamp:
09/06/17 16:19:34 (3 years ago)
Author:
mjuckes
Message:

fixed expts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/ing02/importSect.py

    r1028 r1029  
    2424 
    2525    self.purged = set() 
    26     self.purgeVlab = set( ['sialb','lialb','lialbIs','sltnorth', 'concbb', 'concpoa', 'inc', 'lts', 'pcp', 'fDeforest', 'lateralCtransfer', 'fNdepox', 'fNdepred', 'fBNFsymb', 'fBNFasymb'] ) 
    27     self.purgeCmv = set( [('conccmcn','Eday'), ('conccn','Eday'), ( 'concnmcn','Eday'), 
     26    self.purgeVlab0 = set( ['sialb','lialb','lialbIs','sltnorth', 'concbb', 'concpoa', 'inc', 'lts', 'pcp', 'fDeforest', 'lateralCtransfer', 'fNdepox', 'fNdepred', 'fBNFsymb', 'fBNFasymb'] ) 
     27    self.purgeCmv0 = set( [('conccmcn','Eday'), ('conccn','Eday'), ( 'concnmcn','Eday'), 
    2828                          ('ec550aer','Eday'), ('reffclwc','Eday'), ('reffclws','Eday'), 
    2929                          ('mmrdust', 'Emon'), 
     
    3232                         ('clcalipso2', 'CFsubhrOff'), ('clhcalipso', 'CFsubhrOff'), ('cllcalipso', 'CFsubhrOff'), 
    3333                         ('clmcalipso', 'CFsubhrOff'), ('cltcalipso', 'CFsubhrOff'), ('parasolRefl', 'CFsubhrOff')] ) 
     34    self.purgeVlab = set() 
     35    self.purgeCmv = set() 
    3436    keys = sorted( ee.keys() ) 
    3537    k0 = ['grids','spatialShape','temporalShape','cellMethods','var','structure','CMORvar','requestVarGroup','miptable'] 
     
    297299    for i in range(1,sht.nrows): 
    298300      gp, var, tab, mip, title, p = (str(x.value) for x in sht.row(i)[:6] ) 
    299       ee = {} 
    300       print 'rqvExtra: ',gp, var, tab, gp in self.mapl2u['requestVarGroup'], (tab,var) in self.mapl2u['CMORvar'] 
    301       ee['vid'] = self.mapl2u['CMORvar'][(tab,var)] 
    302       ee['vgid'] = self.mapl2u['requestVarGroup'][gp] 
    303       ee['title'] = title 
    304       ee['priority'] = str( int( float( p ) )  ) 
    305       ee['mip'] = mip 
    306       ee['label'] = '%s-%s' % (tab,var) 
    307       u = hashlib.new( 'sha1', '%s %s' % (ee['vgid'],ee['vid']) ).hexdigest() 
    308       ee['uid'] = u 
    309       assert u not in sh.keys(), 'Duplicate key' 
    310       sh[u] = [ee[k] for k in tags[1:]] 
    311       print u,sh[u] 
     301      if gp != '' and gp[0] != '#': 
     302        ee = {} 
     303        print 'rqvExtra: ',gp, var, tab, gp in self.mapl2u['requestVarGroup'], (tab,var) in self.mapl2u['CMORvar'] 
     304        ee['vid'] = self.mapl2u['CMORvar'][(tab,var)] 
     305        ee['vgid'] = self.mapl2u['requestVarGroup'][gp] 
     306        ee['title'] = title 
     307        ee['priority'] = str( int( float( p ) )  ) 
     308        ee['mip'] = mip 
     309        ee['label'] = '%s-%s' % (tab,var) 
     310        u = hashlib.new( 'sha1', '%s %s' % (ee['vgid'],ee['vid']) ).hexdigest() 
     311        ee['uid'] = u 
     312        assert u not in sh.keys(), 'Duplicate key' 
     313        sh[u] = [ee[k] for k in tags[1:]] 
     314        print u,sh[u] 
    312315             
    313316 
     
    363366 
    364367if __name__ == "__main__": 
    365   l02sh() 
     368  l02sh(idir='exports/l1',odir='exports/l1sh') 
Note: See TracChangeset for help on using the changeset viewer.