Avoid cftime warnings on pp-load

rcomer · Jun 22, 2023 · 5cf5c76 · 5cf5c76
1 parent b3bef26
commit 5cf5c76
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/iris/fileformats/pp.py b/lib/iris/fileformats/pp.py
@@ -1486,7 +1486,7 @@ def t1(self):
 
         """
         if not hasattr(self, "_t1"):
-            has_year_zero = self.lbyr == 0
+            has_year_zero = self.lbyr == 0 or None
             calendar = (
                 None if self.lbmon == 0 or self.lbdat == 0 else self.calendar
             )
@@ -1520,7 +1520,7 @@ def t2(self):
 
         """
         if not hasattr(self, "_t2"):
-            has_year_zero = self.lbyrd == 0
+            has_year_zero = self.lbyrd == 0 or None
             calendar = (
                 None if self.lbmond == 0 or self.lbdatd == 0 else self.calendar
             )
@@ -1567,7 +1567,7 @@ def t1(self):
 
         """
         if not hasattr(self, "_t1"):
-            has_year_zero = self.lbyr == 0
+            has_year_zero = self.lbyr == 0 or None
             calendar = (
                 None if self.lbmon == 0 or self.lbdat == 0 else self.calendar
             )
@@ -1602,7 +1602,7 @@ def t2(self):
 
         """
         if not hasattr(self, "_t2"):
-            has_year_zero = self.lbyrd == 0
+            has_year_zero = self.lbyrd == 0 or None
             calendar = (
                 None if self.lbmond == 0 or self.lbdatd == 0 else self.calendar
             )