Ignore:
Timestamp:
23/09/16 12:58:34 (4 years ago)
Author:
mjuckes
Message:

distrib cand

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreq/trunk/dreqPy/scope.py

    r758 r762  
    394394        print ( '%s, %s, %s' % (r.label, r.title, r.uid) ) 
    395395 
    396     dn = False 
    397     if dn: 
    398 ## obsolete code deleted here 
    399       pass 
    400     elif ex != None: 
     396    if ex != None: 
    401397       
    402398      exi = self.dq.inx.uid[ex] 
     
    410406## The complete set of variables associated with these requests: 
    411407    vars = self.varsByRql( rql, pmax=pmax, intersection=intersection, asDict=True)  
    412     tm = 3 
    413     if tm == 0: 
    414       pass 
    415     elif tm == 1: 
    416       pass 
    417408## 
    418409## filter by configuration option and rank 
     
    421412      len1 = len(vars.keys()) 
    422413      cmv = self.cmvFilter.filterByChoiceRank(cmv=vars.keys()) 
    423  
    424414      vars = cmv 
    425415     
     
    499489                  cc2s[grd].a[u].add( filter1( thisns*thisny*thisne, i.nymax) ) 
    500490 
    501           ##if thisny != None and thisne != None: 
    502               ##cc2s[grd].a[i.esid].add( thisny*thisne ) 
    503            
    504491          if exset != None: 
    505492            sg[grd].add( self.rqiExp[i.uid][irqi] ) 
    506493       
    507       ##if len(s) == 0: 
    508         ##nym[v] = 0 
    509       ##else: 
    510494### 
    511495### sum over experiments of maximum within each experiment 
    512496### 
    513         ##nym[v] = sum( [max( cc2[k] ) for k in cc2] ) 
    514497      for g in sg: 
    515498        nymg[v][g] = sum( [max( cc2s[g].a[k] ) for k in cc2s[g].a] ) 
     
    543526          ks0 = nymg[v].keys() 
    544527          if len(ks0) == 0: 
    545             ##print 'WARN: no nymg entry for %s [%s]' % (v,ex) 
    546528            ff[v] = 0. 
    547529            ny = 0. 
     
    10551037 
    10561038      for v in vl[:mx]: 
    1057         mlg.prnt ( '%s: %7.2fTb' % (self.dq.inx.uid[v].label, cc[v]*2.*1.e-12) ) 
     1039        mlg.prnt ( '%s.%s: %7.2fTb' % (self.dq.inx.uid[v].mipTable,self.dq.inx.uid[v].label, cc[v]*2.*1.e-12) ) 
    10581040      if mx < len(vl): 
    10591041        mlg.prnt ( '%s variables not listed (use --printLinesMax to print more)' % (len(vl)-mx) ) 
Note: See TracChangeset for help on using the changeset viewer.