Changeset 2424 in lmdz_wrf

Timestamp:

Mar 26, 2019, 4:11:55 PM (6 years ago)

Author:

lfita

Message:

Adding:

• `advance_cfDate': Fucntion to advance a time object using a delta time in cf units

File:

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

trunk/tools/generic_tools.py

@@ -60 +60 @@
 
 ####### Content
+# advance_cfDate: Fucntion to advance a time object using a delta time in cf units
 # advance_date: Function to advance a date object a certain given units of time
 # advance_matDate: Function to advance matrix-date with a matrix-increment
@@ -539 +540 @@
     return newdatetime
 
+def advance_cfDate(dateval, dT, Tu):
+    """ Function to advance a time object using a delta time in cf units
+      dateval: time object
+      dT: interval of time to advance
+      Tu: temporal units
+    >>> advance_cfDate(dt.deltatime(1976,2,17,8,39,27), 3600, 'minutes')
+    1976-02-19 20:39:27
+    """
+    import datetime as dt
+    fname = ' advance_cfDate'
+
+    availcfTu = ['weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds']
+
+    if Tu == 'weeks':
+        newdate = dateval + dt.timedelta(weeks=float(dT))
+    elif Tu == 'days':
+        newdate = dateval + dt.timedelta(days=float(dT))
+    elif Tu == 'hours':
+        newdate = dateval + dt.timedelta(hours=float(dT))
+    elif Tu == 'minutes':
+        newdate = dateval + dt.timedelta(minutes=float(dT))
+    elif Tu == 'seconds':
+        newdate = dateval + dt.timedelta(seconds=float(dT))
+    elif Tu == 'milliseconds':
+        newdate = dateval + dt.timedelta(milliseconds=float(dT))
+    else:
+        print errormsg
+        print '  ' + fname + ': time units"' + Tu + '" not ready!!!!'
+        print '    available ones:', availcfTu
+        quit(-1)
+
+    return newdate
+
 def datetimeStr_conversion(StringDT,typeSi,typeSo):
     """ Function to transform a string date to an another date object
@@ -595 +629 @@
         quit()
 
-    if typeSi[0:6] == 'cfTime':
+    if typeSi[0:6] == 'cfTime' and typeSi[0:9] != 'cfTimeCal':
         timeval = np.float(StringDT)
         tunits = typeSi.split(',')[1].split(' ')[0]
@@ -647 +681 @@
         mi = newdate.minute
         se = newdate.second
-    elif typeSi[0:6] == 'cfTimeCal':
+    elif typeSi[0:9] == 'cfTimeCal':
         timeval = np.float(StringDT)
         tunits = typeSi.split(',')[1].split(' ')[0]
@@ -653 +687 @@
         calendar = typeSi.split(',')[2]
 
-        if not gen.searchInlist(availcalendar , calendar):
+        if not searchInlist(availcalendar , calendar):
             print errormsg
             print '  ' + fname + ": calendar '" + + "' not ready !!"
@@ -684 +718 @@
         if calendar == 'noleap' or calendar == '365d':
             removeleap = False
-            newdate = refdate + dt.timedelta(weeks=float(timeval))
+            newdate = advance_cfDate(refdate, timeval, tunits)
+            print newdate, 'leap Feb;', days_month(newdate.year,2)
             if days_month(newdate.year,2) == 29:
                 if newdate.mon == 2 and newdate.day == 28:
@@ -700 +735 @@
             newdate = refdate + dt.timedelta(hours=float(timeval))
         elif tunits == 'minutes':
+            print 'Lluis here ', removeleap, calendar
             if removeleap: timeval = timeval - 1.*24.*60.
             newdate = refdate + dt.timedelta(minutes=float(timeval))
@@ -1005 +1041 @@
 
     return dateYmdHMS
+
+print datetimeStr_conversion(str(137880),'cfTimeCal,minutes since 1979-12-01_00:00:00,noleap','Y/m/d H-M-S')
+quit()
+
 
 def period_information(idate, edate, totunits):