Fix ncycle=1 misaligned dims in climo_xr.py

Author: tomvothecoder

e3sm_diags/driver/utils/climo_xr.py

@@ -152,6 +152,7 @@ def climo(dataset: xr.Dataset, var_key: str, freq: ClimoFreq):
         # averaging.
         dims = [dim for dim in dv.dims if dim != time_coords.name]
         coords = {k: v for k, v in dv.coords.items() if k in dims}
+        climo = climo.squeeze(axis=0)
     elif ncycle > 1:
         dims = [dim for dim in dv.dims]
         coords = {k: v for k, v in dv.coords.items() if k in dims}

tests/e3sm_diags/driver/utils/test_dataset_xr.py

@@ -22,6 +22,7 @@
         dims="lat",
         data=np.array([-90.0, 90]),
         attrs={
+            "units": "degrees_north",
             "axis": "Y",
             "long_name": "latitude",
             "standard_name": "latitude",
@@ -32,6 +33,7 @@
         dims="lon",
         data=np.array([0.0, 180]),
         attrs={
+            "units": "degrees_east",
             "axis": "X",
             "long_name": "longitude",
             "standard_name": "longitude",
@@ -956,10 +958,8 @@ def test_returns_climo_dataset_using_climo_of_time_series_files(self):
             name="ts", data=np.array([[1.0, 1.0], [1.0, 1.0]]), dims=["lat", "lon"]
         )
         # Set all of the correct attributes.
-        expected = expected.assign(**spatial_coords, **spatial_bounds)  # type: ignore
-        expected["lat"].attrs["units"] = "degrees_north"
-        expected["lat_bnds"].attrs["xcdat_bounds"] = "True"
-        expected["lon_bnds"].attrs["xcdat_bounds"] = "True"
+        expected = expected.assign(**spatial_coords)  # type: ignore
+        expected = expected.drop_dims("time")
 
         xr.testing.assert_identical(result, expected)