Changeset 1068 for CMIP6dreqbuild


Ignore:
Timestamp:
04/10/17 17:23:25 (2 years ago)
Author:
mjuckes
Message:

01.00.16

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

Legend:

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

    r928 r1068  
    204204       u'monClim':12, u'Timestep':100, u'6hr':4*365, u'day':365, u'1day':365, u'mon':12, u'yr':1, 
    205205       u'1mon':12, 'month':12, 'year':1, 'monthly':12, 'hr':24*365, 'other':24*365, 
    206         'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1 } 
     206        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1,  
     207        '1hrCM':24*12, '1hrPt':24*365, '3hrPt':8*365, '6hrPt':4*365, 'monPt':12, 'monC':12, 'subhrPt':24*365, 'yrPt':1 } 
    207208  def __init__(self,dq,rqi=None,byMip=None): 
    208209    self.dq = dq 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

    r1063 r1068  
    199199       u'monClim':12, u'Timestep':100, u'6hr':4*365, u'day':365, u'1day':365, u'mon':12, u'yr':1, 
    200200       u'1mon':12, 'month':12, 'year':1, 'monthly':12, 'hr':24*365, 'other':24*365, 
    201         'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1 } 
    202  
    203 ## There are 4 cmor variables with blank frequency .... 
     201        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1, 
     202        '1hrCM':24*12, '1hrPt':24*365, '3hrPt':8*365, '6hrPt':4*365, 'monPt':12, 'monC':12, 'subhrPt':24*365, 'yrPt':1 } 
    204203 
    205204def vol01( sz, v, npy, freq, inx ): 
     
    831830              ff[v] = 0. 
    832831 
    833         if inx.uid[v].frequency != 'monClim': 
     832        if inx.uid[v].frequency not in ['monClim','monC']: 
    834833          ff[v] = ff[v]*ny 
    835834 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/utilities.py

    r903 r1068  
    6464 
    6565    vidt = vidt[0] 
    66     taf = [i for i in cmv if self.dq.inx.uid[i].vid == vidt and self.dq.inx.uid[i].frequency in ['3hr','6hr']] 
    67     tau = [i for i in self.sc.allVars if self.dq.inx.uid[i].vid == vidt and self.dq.inx.uid[i].frequency in ['3hr','6hr']] 
     66    taf = [i for i in cmv if self.dq.inx.uid[i].vid == vidt and self.dq.inx.uid[i].frequency in ['3hr','6hr','3hrPt','6hrPt']] 
     67    tau = [i for i in self.sc.allVars if self.dq.inx.uid[i].vid == vidt and self.dq.inx.uid[i].frequency in ['3hr','6hr','3hrPt','6hrPt']] 
    6868## 
    6969## NB not easy to separate pressure level from model level variables here 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py

    r1062 r1068  
    144144      if i._h.label != 'remarks': 
    145145        npy = self.npy[ i.frequency ] 
    146         isClim = i.frequency.lower().find( 'clim' ) != -1 
     146        isClim = i.frequency.lower().find( 'clim' ) != -1 or i.frequency in ['monC', '1hrCM'] 
    147147        st = self.sc.dq.inx.uid[i.stid] 
    148148        c1 = 0 
     
    161161          else: 
    162162            print ('ERROR.obsoleteMip.00001: %s,%s,%s' % (ee.mip,ee.label,ee.uid) ) 
    163         if i.frequency == 'mon': 
     163        if i.frequency in ['mon','monPt']: 
    164164            mvol[tt][u] = c1 
    165165 
Note: See TracChangeset for help on using the changeset viewer.