Changeset 877


Ignore:
Timestamp:
23/11/16 20:15:55 (3 years ago)
Author:
mjuckes
Message:

unique vol bug fixed

Location:
CMIP6dreqbuild/trunk/src/framework/dreqPy
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

    r876 r877  
    934934    mxls.run( m, mlab=mlab ) 
    935935 
    936   def cmvByInvMip( self, mip,pmax=1,includeYears=False, exptFilter=None ): 
     936  def cmvByInvMip( self, mip,pmax=1,includeYears=False, exptFilter=None,exptFilterBlack=None ): 
    937937    mips = set( self.mips[:] ) 
    938938    if type(mip) == type( '' ): 
     
    942942        mips.discard( m ) 
    943943 
    944     return self.cmvByMip( mips,pmax=pmax,includeYears=includeYears, exptFilter=exptFilter ) 
     944    return self.cmvByMip( mips,pmax=pmax,includeYears=includeYears, exptFilter=exptFilter, exptFilterBlack=exptFilterBlack ) 
    945945 
    946946  def cmvByMip( self, mip,pmax=1,includeYears=False, exptFilter=None, exptFilterBlack=None ): 
     
    13941394      --grdpol <native|1deg> :  policy for default grid, if MIPs have not expressed a preference; 
    13951395      --allgrd :  When a variable is requested on multiple grids, archive all grids requested (default: only the finest resolution); 
    1396       --unique :  List only variables which are not requested uniquely by this MIP, for at least one experiment; 
     1396      --unique :  List only variables which are requested uniquely by this MIP, for at least one experiment; 
    13971397      --txt : Create text file with requested variables; 
    13981398      --mcfg : Model configuration: 7 integers, comma separated, 'nho','nlo','nha','nla','nlas','nls','nh1' 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py

    r875 r877  
    100100 
    101101        if m != 'TOTAL' and 'TOTAL' in theseMips: 
    102           cmv1 = self.sc.cmvByInvMip(thism,pmax=pmax,includeYears=True) 
     102          cmv1, cmvts = self.sc.cmvByInvMip(thism,pmax=pmax,includeYears=True) 
    103103          self.uniqueCmv = self.sc.differenceSelectedCmvDict(  cmv1, cmvTotal ) 
    104104 
Note: See TracChangeset for help on using the changeset viewer.