Merge branch 'NOAA-GFDL:main' into main

nishsilva · May 16, 2024 · 1e12b11 · 1e12b11
2 parents ba47ed1 + 718518a
commit 1e12b11
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/preprocessor.py b/src/preprocessor.py
@@ -855,7 +855,7 @@ def query_catalog(self,
             # path_regex = re.compile(r'(?i)(?<!\\S){}(?!\\S+)'.format(case_name))
             path_regex = re.compile(r'({})'.format(case_name))
             # path_regex = '*' + case_name + '*'
-            freq = case_d.varlist.T.frequency
+            freq = case_d.varlist.T.frequency.format()
 
             for v in case_d.varlist.iter_vars():
                 realm_regex = v.realm + '*'

diff --git a/src/util/datelabel.py b/src/util/datelabel.py
@@ -1148,7 +1148,10 @@ def format(self):
         if self.unit == 'fx':
             return 'fx'
         else:
-            return "{}{}".format(self.quantity, self.unit)
+            if self.quantity == '1':
+                return self.unit
+            else:
+                return "{}{}".format(self.quantity, self.unit)
 
     __str__ = format