small changes

so that time is found as a coordinate or an axes, not sure why it is not being found as an axes though

Author: kthyng

model_catalogs/model_catalogs.py

@@ -258,7 +258,9 @@ def setup(locs="mc_", override=False, boundaries=True):
 
         # initial_cats is a list of Catalogs in this case
         cats = [
-            intake.cat[cat_name] for cat_name in list(intake.cat) if loc in cat_name
+            intake.cat[cat_name]
+            for cat_name in list(intake.cat)
+            if str(loc) in cat_name
         ]
 
         # remove the prefix from the catalog name

model_catalogs/process.py

@@ -251,7 +251,10 @@ def to_dask(self):
             )
 
             # drop any time duplicates that may be present (RTOFS can have)
-            self._ds = self._ds.drop_duplicates(dim=self._ds.cf.axes["T"])
+            if "T" in self._ds.cf.axes:
+                self._ds = self._ds.drop_duplicates(dim=self._ds.cf.axes["T"])
+            elif "time" in self._ds.cf.coordinates:
+                self._ds = self._ds.drop_duplicates(dim=self._ds.cf.coordinates["time"])
 
             # check for 'urlpath' update being sent in, if so use it to
             # subselect ds in time

model_catalogs/tests/test_catalogs.py

@@ -2,6 +2,7 @@
 Make sure catalogs work correctly. If this doesn't run once, try again since the servers can be finnicky.
 """
 
+import pathlib
 import warnings
 
 from unittest import mock
@@ -112,6 +113,14 @@ def test_boundaries():
     assert "bbox" in boundaries[model]
     assert "wkt" in boundaries[model]
 
+    # also test through setup with just this one
+    import mc_goods
+
+    # input catalog file directly
+    catloc = pathlib.Path(mc_goods.__path__[0]) / "gofs.yaml"
+    main_cat = mc.setup(catloc)
+    assert "geospatial_bounds" in main_cat["GOFS"].metadata
+
 
 # @pytest.mark.slow
 # this test continues to be too brittle with CO-OPS servers breaking constantly but in different ways each time