Changeset 2427 in lmdz_wrf for trunk

Timestamp:

Apr 9, 2019, 8:02:21 PM (7 years ago)

Author:

lfita

Message:

Working version with noleap calendar

File:

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

trunk/tools/generic_tools.py

@@ -524 +524 @@
         if days_month(iyr,2) == 29: Nleapdays=Nleapdays+1
 
-
     return Nleapdays
 
@@ -621 +620 @@
     137880.0
     >>> datetimeStr_conversion('-12357.961','cfTimeCal,days since 1949-12-01 00:00:00,noleap','Y/m/d H-M-S')
-
+    1916/02/09 00-56-09
     """
     import datetime as dt
@@ -740 +739 @@
             removeleap = False
             newdate = advance_cfDate(refdate, timeval, tunits)
-            if days_month(newdate.year,2) == 29:
-                if newdate.month == 2 and newdate.day == 28:
-                    removeleap = True
-                elif newdate.month > 2: removeleap = True
+            if int(yrref) <= newdate.year:
+                Nleapd = leapdays(int(yrref), newdate.year)
+            else:
+                Nleapd = leapdays(newdate.year, int(yrref))
+            removeleap = True
 
         if tunits == 'weeks':
-            if removeleap: timeval = timeval - 1./7.
+            if removeleap: timeval = timeval + 1./7.*Nleapd
             newdate = refdate + dt.timedelta(weeks=float(timeval))
         elif tunits == 'days':
-            if removeleap: timeval = timeval - 1.
+            if removeleap: timeval = timeval + 1.*Nleapd
             newdate = refdate + dt.timedelta(days=float(timeval))
         elif tunits == 'hours':
-            if removeleap: timeval = timeval - 1.*24.
+            if removeleap: timeval = timeval + 1.*24.*Nleapd
             newdate = refdate + dt.timedelta(hours=float(timeval))
         elif tunits == 'minutes':
             print 'Lluis here ', removeleap, calendar
-            if removeleap: timeval = timeval - 1.*24.*60.
+            if removeleap: timeval = timeval + 1.*24.*60.*Nleapd
             newdate = refdate + dt.timedelta(minutes=float(timeval))
         elif tunits == 'seconds':
-            if removeleap: timeval = timeval - 1.*24.*3600.
+            if removeleap: timeval = timeval + 1.*24.*3600.*Nleapd
             newdate = refdate + dt.timedelta(seconds=float(timeval))
         elif tunits == 'milliseconds':
-            if removeleap: timeval = timeval - 1.*24.*3600.*1000.
+            if removeleap: timeval = timeval + 1.*24.*3600.*1000.*Nleapd
             newdate = refdate + dt.timedelta(milliseconds=float(timeval))
         else: