Changeset 2481 in lmdz_wrf for trunk

Timestamp:

Apr 29, 2019, 7:18:15 PM (6 years ago)

Author:

lfita

Message:

Adding '365_day' as noleap calendar

Location:

trunk/tools

Files:

• generic_tools.py (modified) (14 diffs)
• nc_var_tools.py (modified) (1 diff)

trunk/tools/generic_tools.py

@@ -937 +937 @@
               * leap years: 'leap', '365d', 'gregorian', 'Gregorian', 'standard', 
                 'Standard'
-              * no-leap years: 'noleap', '360d'
+              * no-leap years: 'noleap', '360d', '365d', '365_day'
         'matYmdHMS': numerical vector with [[YYYY], [MM], [DD], [HH], [MI], [SS]]
         'YmdHMS': [YYYY][MM][DD][HH][MI][SS] format
@@ -976 +976 @@
     availcftimeu = ['weeks', 'days', 'hours', 'minutes', 'seconds', 'milliseconds']
     availcalendar = ['leap', '366d', 'gregorian', 'Gregorian', 'standard',           \
-      'Standard', 'noleap', '365d', '360d', 'proleptic_gregorian']
+      'Standard', 'noleap', '365d', '365_day', '360d', 'proleptic_gregorian']
 
     if type(StringDT) == type('S') and StringDT[0:1] == 'h':
@@ -1071 +1071 @@
 
         removeleap = False
-        if calendar == 'noleap' or calendar == '365d':
+        if calendar == 'noleap' or calendar == '365d' or calendar == '365_day':
             newdate = advance_cfDate(refdate, timeval, tunits)
             if int(yrref) <= newdate.year:
@@ -1290 +1290 @@
             totsecs = difft.days()*24*3600. + difft.seconds()
 
-        if calendar == 'noleap' or calendar == '365d':
+        if calendar == 'noleap' or calendar == '365d' or calendar == '365_day':
             removeleap = False
             if int(yrref) <= datei.year:
@@ -1299 +1299 @@
             totsecs = totsecs-Nleapd*24*3600.
 
-        if calendar == 'noleap' or calendar == '365d':
+        if calendar == 'noleap' or calendar == '365d' or calendar == '365_day':
             removeleap = False
             if days_month(datei.year,2) == 29:
@@ -2234 +2234 @@
 
     availTu = ['weeks', 'days', 'hours', 'minutes', 'seconds']
-    availcalendar = ['noleap', '365d']
+    availcalendar = ['noleap', '365d', '365_day']
 
     lTunits = Tunits.split(' ')
@@ -2287 +2287 @@
 
     yrref = refdate.year
-    if cal == 'noleap' or cal == '365d':
+    if cal == 'noleap' or cal == '365d' or cal == '365_day':
         for it in range(dimt):
             # Some issues in implementations/machines ...
@@ -2334 +2334 @@
 
     availTu = ['weeks', 'days', 'hours', 'minutes', 'seconds']
-    availcalendar = ['noleap', '365d']
+    availcalendar = ['noleap', '365d', '365_day']
 
     lTunits = Tunits.split(' ')
@@ -2388 +2388 @@
 
     yrref = refdate[0]
-    if cal == 'noleap' or cal == '365d':
+    if cal == 'noleap' or cal == '365d' or cal == '365_day':
         for it in range(dimt):
             tdays = refdays + timevdays[it]
@@ -2443 +2443 @@
 
     # For non-gregorian calendars, we impose gregorian (since, we are using python)
-    if cal == 'noleap' or cal == '365d':
+    if cal == 'noleap' or cal == '365d' or cal == '365_day':
         timev = impose_gregorian(timeval, tu + ' since ' + daterefS, cal)
     else:
@@ -2589 +2589 @@
     if tcalendar is not None:
       print '  netCDFdatetime_realdatetime: There is a calendar attribute'
-      if tcalendar == '365_day' or tcalendar == 'noleap':
+      if tcalendar == '365_day' or tcalendar == 'noleap'  or tcalendar == '365d':
           print '    netCDFdatetime_realdatetime: No leap years!'
           isleapcal = False
-      elif tcalendar == 'proleptic_gregorian' or tcalendar == 'standard' or tcalendar == 'gregorian':
+      elif tcalendar == 'proleptic_gregorian' or tcalendar == 'standard' or          \
+        tcalendar == 'gregorian':
           isleapcal = True
       elif tcalendar == '360_day':
@@ -2599 +2600 @@
       else:
           print errormsg
-          print '    netCDFdatetime_realdatetime: Calendar "' + tcalendar + '" not prepared!'
+          print '    netCDFdatetime_realdatetime: Calendar "' + tcalendar +          \
+            '" not prepared!'
           quit(-1)
 
@@ -5432 +5434 @@
     if tcalendar is not None:
       print '  netCDFdatetime_realdatetime: There is a calendar attribute'
-      if tcalendar == '365_day' or tcalendar == 'noleap':
+      if tcalendar == '365_day' or tcalendar == 'noleap' or tcalendar == '365d':
           print '    netCDFdatetime_realdatetime: No leap years!'
           isleapcal = False
-      elif tcalendar == 'proleptic_gregorian' or tcalendar == 'standard' or tcalendar == 'gregorian':
+      elif tcalendar == 'proleptic_gregorian' or tcalendar == 'standard' or          \
+        tcalendar == 'gregorian':
           isleapcal = True
       elif tcalendar == '360_day':
@@ -16339 +16342 @@
 
     # If the calendar is not gregorian, it needs to be fixed from origSrefdate!
-    if origcal == 'noleap' or origcal == '365d':
+    if origcal == 'noleap' or origcal == '365d' or origcal == '365_day':
         print '  ' + fname + ": found non-standard calendar '" + origcal + "' !!"
         # Imposing to gregorian calendar

trunk/tools/nc_var_tools.py

@@ -25562 +25562 @@
         quit(-1)
     
-    if calendar == 'noleap' or calendar == '365d':
+    if calendar == 'noleap' or calendar == '365d' or calendar == '365_day' :
         # Adding leap days to avoid dephase (thus, imposing 'gregorian' calendar)
         gregtime = gen.impose_gregorian(timev0, uTunits, calendar)