Changeset 2483 in lmdz_wrf for trunk/tools

Timestamp:

Apr 29, 2019, 8:51:11 PM (7 years ago)

Author:

lfita

Message:

Adding `calendar_type' as possible 'calendar' attribute

File:

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

trunk/tools/nc_var_tools.py

@@ -2584 +2584 @@
                 self.unitsval = units
 
-                if not gen.searchInlist(attvar, 'calendar'):
+                if not gen.searchInlist(attvar, 'calendar') or                       \
+                  not gen.searchInlist(attvar, 'calendar_type'):
                     print warnmsg
                     print '  ' + fname + ": time variable '", tname, "' does not " + \
@@ -2591 +2592 @@
                     cal = 'gregorian'
                 else:
-                    self.calendar = times.getncattr('calendar')
+                    atimes = times.ncattrs()
+                    if gen.searchInlist(atimes, 'calendar'): 
+                        self.calendar = times.getncattr('calendar')
+                    elif gen.searchInlist(atimes, 'calendar_type'): 
+                        self.calendar = times.getncattr('calendar_type')
                     cal = times.getncattr('calendar')
   
@@ -25557 +25562 @@
     # Checking calendar consistency
     if calendar != timec:
-        print errmsg
+        print errormsg
         print '  ' + fname + ": different calendars found !!" 
         print "    input calendar: '" + calendar + "' calendar in data '" +timec + "'"
@@ -31721 +31726 @@
           'since [YYYY]-[MM]-[DD] [HH]:[MM]:[SS]'
         quit(-1)
-    if not gen.searchInlist(timeattrs,'calendar'):
+    if not gen.searchInlist(timeattrs,'calendar') or                                 \
+      not gen.searchInlist(timeattrs,'calendar_type'):
         print warnmsg
         print '  ' + fname + ": time variable '" + variable + "' without calendar !!"
@@ -31728 +31734 @@
         origcal = 'gregorian'
     else:
-        origcal = otime.getncattr('calendar')
+        if gen.searchInlist(timeattrs,'calendar'): 
+            origcal = otime.getncattr('calendar')
+        if gen.searchInlist(timeattrs,'calendar_type'): 
+            origcal = otime.getncattr('calendar_type')
+            otime.delncattr('calendar_type')
+            otime.setncattr('calendar',origcal)
 
     for opn in operations: