Changeset 2487 in lmdz_wrf for trunk

Timestamp:

Apr 30, 2019, 1:43:11 PM (6 years ago)

Author:

lfita

Message:

Getting the right if for checking with 'calendar' and 'calendar_type'

File:

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

trunk/tools/nc_var_tools.py

@@ -2584 +2584 @@
                 self.unitsval = units
 
-                if not gen.searchInlist(attvar, 'calendar') or                       \
+                if not gen.searchInlist(attvar, 'calendar') and                      \
                   not gen.searchInlist(attvar, 'calendar_type'):
                     print warnmsg
@@ -31726 +31726 @@
           'since [YYYY]-[MM]-[DD] [HH]:[MM]:[SS]'
         quit(-1)
-    if not gen.searchInlist(timeattrs,'calendar') or                                 \
+    if not gen.searchInlist(timeattrs,'calendar') and                                \
       not gen.searchInlist(timeattrs,'calendar_type'):
         print warnmsg