Changeset 1068

Timestamp:

04/10/17 17:23:25 (2 years ago)

Author:

mjuckes

Message:

01.00.16

Location:

CMIP6dreqbuild/trunk/src/framework/dreqPy

Files:

• misc_utils.py (modified) (1 diff)
• scope.py (modified) (2 diffs)
• utilities.py (modified) (1 diff)
• volsum.py (modified) (2 diffs)

CMIP6dreqbuild/trunk/src/framework/dreqPy/misc_utils.py

@@ -204 +204 @@
        u'monClim':12, u'Timestep':100, u'6hr':4*365, u'day':365, u'1day':365, u'mon':12, u'yr':1,
        u'1mon':12, 'month':12, 'year':1, 'monthly':12, 'hr':24*365, 'other':24*365,
-        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1 }
+        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1, 
+        '1hrCM':24*12, '1hrPt':24*365, '3hrPt':8*365, '6hrPt':4*365, 'monPt':12, 'monC':12, 'subhrPt':24*365, 'yrPt':1 }
   def __init__(self,dq,rqi=None,byMip=None):
     self.dq = dq

CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

@@ -199 +199 @@
        u'monClim':12, u'Timestep':100, u'6hr':4*365, u'day':365, u'1day':365, u'mon':12, u'yr':1,
        u'1mon':12, 'month':12, 'year':1, 'monthly':12, 'hr':24*365, 'other':24*365,
-        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1 }
-
-## There are 4 cmor variables with blank frequency ....
+        'subhr':24*365, 'Day':365, '6h':4*365, '3 hourly':8*365, '':1, 'dec':0.1,
+        '1hrCM':24*12, '1hrPt':24*365, '3hrPt':8*365, '6hrPt':4*365, 'monPt':12, 'monC':12, 'subhrPt':24*365, 'yrPt':1 }
 
 def vol01( sz, v, npy, freq, inx ):
@@ -831 +830 @@
               ff[v] = 0.
 
-        if inx.uid[v].frequency != 'monClim':
+        if inx.uid[v].frequency not in ['monClim','monC']:
           ff[v] = ff[v]*ny
 

CMIP6dreqbuild/trunk/src/framework/dreqPy/utilities.py

@@ -64 +64 @@
 
     vidt = vidt[0]
-    taf = [i for i in cmv if self.dq.inx.uid[i].vid == vidt and self.dq.inx.uid[i].frequency in ['3hr','6hr']]
-    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']]
+    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']]
+    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']]
 ##
 ## NB not easy to separate pressure level from model level variables here

CMIP6dreqbuild/trunk/src/framework/dreqPy/volsum.py

@@ -144 +144 @@
       if i._h.label != 'remarks':
         npy = self.npy[ i.frequency ]
-        isClim = i.frequency.lower().find( 'clim' ) != -1
+        isClim = i.frequency.lower().find( 'clim' ) != -1 or i.frequency in ['monC', '1hrCM']
         st = self.sc.dq.inx.uid[i.stid]
         c1 = 0
@@ -161 +161 @@
           else:
             print ('ERROR.obsoleteMip.00001: %s,%s,%s' % (ee.mip,ee.label,ee.uid) )
-        if i.frequency == 'mon':
+        if i.frequency in ['mon','monPt']:
             mvol[tt][u] = c1