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/ingest/expts.py

    r1027 r1029  
    2424    self.expts = ex['experiment_id'] 
    2525    self.mip = {} 
     26    self.title = {} 
    2627    for k in self.expts: 
     28      self.title[k] = self.expts[k]['experiment'] 
    2729      m0 = self.expts[k]['activity_id'][0] 
    2830      m = fmip.match( m0 ) 
     
    114116 
    115117rqMaps = {} 
     118rqMapsa = {} 
    116119for k in em.exptMap: 
    117120  for i in em.exptMap[k]: 
    118121    assert i not in rqMaps 
    119122    rqMaps[i] = em.exptMap[k][i] 
     123 
     124for k in em.exptMapa: 
     125  for i in em.exptMapa[k]: 
     126    assert i not in rqMapsa 
     127    a,b = em.exptMapa[k][i] 
     128    assert len(a) == len(b) 
     129    ll = [] 
     130    for x in range(len(a)): 
     131      ll.append( (a[x],b[x]) ) 
     132       
     133    rqMapsa[i] = ll 
    120134 
    121135class request(object): 
     
    296310  ee[k] = lcm[k] 
    297311oo = open( 'exptNameMaps.json', 'w' ) 
    298 json.dump( {'info':{'title':'Updating experiment names in data request'}, 'maps':ee}, oo, indent=4, sort_keys=True ) 
     312json.dump( {'info':{'title':'Updating experiment names in data request'}, 'maps':ee, 'multi':rqMapsa}, oo, indent=4, sort_keys=True ) 
    299313oo.close() 
    300314oo = open( 'exptDesc.json', 'w' ) 
    301 json.dump( {'info':{'title':'Updating experiment descriptions from ESDOC'}, 'maps':xc.es.edesc}, oo, indent=4, sort_keys=True ) 
     315json.dump( {'info':{'title':'Updating experiment descriptions from ESDOC & CMIP6 CV'}, 'description':xc.es.edesc, 'title':xc.kt.title}, oo, indent=4, sort_keys=True ) 
    302316oo.close() 
    303317 
Note: See TracChangeset for help on using the changeset viewer.