Changeset 835


Ignore:
Timestamp:
09/11/16 10:04:55 (3 years ago)
Author:
mjuckes
Message:

fix volsum import for python3 pip

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

Legend:

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

    r803 r835  
    11 
    22import collections, os, sys 
    3 import volsum 
    43 
    54nt__charmeEnable = collections.namedtuple( 'charme', ['id','site'] ) 
     
    109  import misc_utils 
    1110  import rvgExtraTable 
     11  import volsum 
    1212except: 
     13  import dreqPy.volsum as volsum 
    1314  import dreqPy.dreq as dreq 
    1415  import dreqPy.vrev as vrev 
  • CMIP6dreqbuild/trunk/src/framework/ingest/util_checkUpd.py

    r825 r835  
    691691    self.shInfo = {'prov': '%s request template, request scoping sheet' % mip, 'label': mip, 'title': 'CMIP6 Data Request'} 
    692692    self.sh['__info__'] = self.shInfo 
     693    dmin = ['minpblz',] 
     694    dmax = ['maxpblz',] 
    693695 
    694696    self.nnss = 0 
     
    705707        assert tlab in ['mean','point'], 'Time dimension label %s not recognised' % tlab 
    706708        tdim, cmet = {'mean':('time','time: mean'), 'point':('time1','')}[tlab] 
     709        if v0 in dmin: 
     710          cmet = 'time: minimum' 
     711        elif v0 in dmax: 
     712          cmet = 'time: maximum' 
    707713        cmea = 'area: areacella' 
    708714        dims = spdims + ' ' + tdim 
Note: See TracChangeset for help on using the changeset viewer.