Merge branch 'main' into mpassit_driver

Author: christinaholtNOAA

src/uwtools/drivers/ungrib.py

@@ -20,7 +20,6 @@ class Ungrib(DriverCycleBased):
     """
 
     PREFIX = "FILE"
-    TIMEFMT = "%Y-%m-%d_%H:00:00"
 
     # Workflow tasks
 
@@ -49,13 +48,14 @@ def namelist_file(self):
         """
         The namelist file.
         """
+        timefmt = "%Y-%m-%d_%H:00:00"
         d = {
             "update_values": {
                 "share": {
-                    "end_date": self._end_date.strftime(self.TIMEFMT),
+                    "end_date": self._end_date.strftime(timefmt),
                     "interval_seconds": self._interval,
                     "max_dom": 1,
-                    "start_date": self._cycle.strftime(self.TIMEFMT),
+                    "start_date": self._cycle.strftime(timefmt),
                     "wrf_core": "ARW",
                 },
                 "ungrib": {
@@ -117,7 +117,7 @@ def output(self) -> dict[str, list[Path]]:
         paths = []
         ts = self._cycle
         while ts <= self._end_date:
-            fn = "%s:%s" % (self.PREFIX, ts.strftime(self.TIMEFMT))
+            fn = "%s:%s" % (self.PREFIX, ts.strftime("%Y-%m-%d_%H"))
             paths.append(self.rundir / fn)
             ts += timedelta(seconds=self._interval)
         return {"paths": paths}

src/uwtools/tests/drivers/test_ungrib.py

@@ -82,12 +82,7 @@ def test_Ungrib_namelist_file(driverobj):
 
 def test_Ungrib_output(driverobj):
     assert driverobj.output["paths"] == [
-        driverobj.rundir / f"FILE:{x}"
-        for x in (
-            "2024-02-01_18:00:00",
-            "2024-02-02_00:00:00",
-            "2024-02-02_06:00:00",
-        )
+        driverobj.rundir / f"FILE:{x}" for x in ("2024-02-01_18", "2024-02-02_00", "2024-02-02_06")
     ]