Ignore:
Timestamp:
15/02/19 14:37:03 (8 months ago)
Author:
mjuckes
Message:

01.00.30beta

File:
1 edited

Legend:

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

    r1292 r1309  
    251251 
    252252    ##self.mips = set( [x.label for x in self.dq.coll['mip'].items ] ) 
    253     ##self.mips = ['CMIP','AerChemMIP', 'C4MIP', 'CFMIP', 'DAMIP', 'DCPP', 'FAFMIP', 'GeoMIP', 'GMMIP', 'HighResMIP', 'ISMIP6', 'LS3MIP', 'LUMIP', 'OMIP', 'PAMIP', 'PMIP', 'RFMIP', 'ScenarioMIP', 'VolMIP', 'CORDEX', 'DynVar', 'SIMIP', 'VIACSAB'] 
     253    ##self.mips = ['CMIP','AerChemMIP', 'C4MIP', 'CFMIP', 'DAMIP', 'DCPP', 'FAFMIP', 'GeoMIP', 'GMMIP', 'HighResMIP', 'ISMIP6', 'LS3MIP', 'LUMIP', 'OMIP', 'PAMIP', 'PMIP', 'RFMIP', 'ScenarioMIP', 'VolMIP', 'CORDEX', 'DynVar', 'DynVarMIP', 'SIMIP', 'VIACSAB'] 
    254254    self.mips = ['CMIP'] + scope_utils.mips 
    255255    self.mipsp = self.mips[:-4] 
     
    706706    if not self.retainRedundantRank: 
    707707      len1 = len(vars.keys()) 
    708       cmv = self.cmvFilter.filterByChoiceRank(cmv=vars.keys()) 
     708      cmv = self.cmvFilter.filterByChoiceRank(cmv=set(vars.keys())) 
    709709      vars = cmv 
    710710     
     
    937937      dat2 = {} 
    938938      for i in e: 
    939         dat2[i.uid] = (i.ntot, i.yps, i.ensz, i.tier, i.nstart, filter1(i.yps,rqi.nymax), filter2(i.ensz,rqi.nenmax,i.tier,self.tierMax) ) 
     939        ## verified that this change (i.ntot --> None) has zero impact on tab01_3_3.texfrag ... i.e. data volumes are not affected. 
     940        ## just as well, since values in data request are not correct. 
     941        ##dat2[i.uid] = (i.ntot, i.yps, i.ensz, i.tier, i.nstart, filter1(i.yps,rqi.nymax), filter2(i.ensz,rqi.nenmax,i.tier,self.tierMax) ) 
     942        dat2[i.uid] = (None, i.yps, i.ensz, i.tier, i.nstart, filter1(i.yps,rqi.nymax), filter2(i.ensz,rqi.nenmax,i.tier,self.tierMax) ) 
    940943 
    941944      nytot = sum( [dat2[x][-2]*dat2[x][-3] for x in dat2 ] ) 
Note: See TracChangeset for help on using the changeset viewer.