Changeset 2479 in lmdz_wrf for trunk/tools

Timestamp:

Apr 29, 2019, 4:47:22 PM (7 years ago)

Author:

lfita

Message:

Adding message when reference date is < 1900 in `CFtimeU_inf' and adding original cftime units passed

File:

• trunk/tools/generic_tools.py (modified) (5 diffs)

trunk/tools/generic_tools.py

@@ -687 +687 @@
             quit(-1)
 
+        self.origvalue = cftimeu
         self.refdate = origSrefdate + ' ' + horrefS + ':' + minrefS + ':' + secrefS
         self.refdateYMHdms = origSrefdate[0:4] + origSrefdate[5:7] +                 \
@@ -694 +695 @@
         if yrref >= 1900: self.refdateDT = dt.datetime(yrref,monref,dayref,horref,   \
           minref,secref)
-        else: self.refdateDT = None
+        else: 
+            print warnmsg
+            print '  ' + fname + ": temporal units '" + cftimeu + "' with a " +      \
+              "reference date '" + origSrefdate + "' prior to accepted datetime " +  \
+              "range of 1900 !!"
+            print "    setting a 'None' value as 'self.refdateDT'"
+            self.refdateDT = None
 
         self.Tunits = origtunits
@@ -16670 +16677 @@
     """
     fname = 'change_CFcalendar'
-    availorigcal = ['noleap', '365d', '365_day']
+    availorigcal = ['noleap', '360d', '365d', '365_day']
     availnewcal = ['gregorian', 'standard']
 
@@ -16685 +16692 @@
             quit(-1)
 
-    elif origcal == '3650d':
+    elif origcal == '360d':
         print '  ' + fname + ": found non-standard calendar '" + origcal + "' !!"
         # We only can fix the 12x30 days calendar for monthly values... ?
@@ -16694 +16701 @@
         # Transforming to regular months
         if newcal == 'gregorian' or newcal == 'standard':
-            newtimevals = from360d_reg(tvals, tunits, kind='monpercen')
+            newtimevals = from360d_reg(timevals, origcftimeu, kind='monpercen')
 
     else: