Merge pull request #40 from JamesMcClung/pr/fixes-for-numpy

Fix for unwrapping 1d numpy arrays

Author: JamesMcClung

src/pscpy/psc.py

@@ -37,7 +37,6 @@ def __init__(
         self.x = self._get_coord(0)
         self.y = self._get_coord(1)
         self.z = self._get_coord(2)
-        self.t = float(ds.attrs["time"])
 
     def _get_coord(self, coord_idx: int) -> NDArray[Any]:
         return np.linspace(
@@ -63,6 +62,12 @@ def iter_components(field: Hashable, species_names: Iterable[str]) -> Generator[
                 yield f"{moment}_{species_name}"
 
 
+def unwrap_float(arr: np.ndarray) -> float:
+    if arr.ndim == 0:
+        return float(arr)
+    return float(arr[0])
+
+
 def decode_psc(
     ds: xr.Dataset,
     species_names: Iterable[str],
@@ -96,7 +101,7 @@ def decode_psc(
         "x": ("x", run_info.x),
         "y": ("y", run_info.y),
         "z": ("z", run_info.z),
-        "t": run_info.t,
+        "t": unwrap_float(ds.attrs["time"]),
     }
     ds = ds.assign_coords(coords)
 

src/pscpy/sample/pfd.000000000.bp/data.0

@@ -0,0 +1,4 @@
+[
+{ "rank":0, "start":"Fri_Apr_10_11:45:56_2026","PP_mus": 0, "PP":{"mus":0, "nCalls":2},"ES_close_mus": 65, "ES_close":{"mus":65, "nCalls":1},"ES_AWD_mus": 403, "ES_AWD":{"mus":403, "nCalls":1},"ES_mus": 872, "ES":{"mus":872, "nCalls":1},"ES_meta2_mus": 398, "ES_meta2":{"mus":398, "nCalls":1},"ES_meta1_mus": 4, "ES_meta1":{"mus":4, "nCalls":1},"ES_meta1_gather_mus": 2, "ES_meta1_gather":{"mus":2, "nCalls":1}, "databytes":0, "metadatabytes":0, "metametadatabytes":0, "transport_0":{"type":"File_POSIX", "wbytes":1152, "close":{"mus":15, "nCalls":1}, "write":{"mus":19, "nCalls":2}, "open":{"mus":36, "nCalls":1}}, "transport_1":{"type":"File_POSIX", "wbytes":1304, "close":{"mus":9, "nCalls":1}, "write":{"mus":78, "nCalls":7}, "open":{"mus":101, "nCalls":1}} },
+{ "rank":1, "start":"Fri_Apr_10_11:45:56_2026","PP_mus": 0, "PP":{"mus":0, "nCalls":2},"ES_close_mus": 61, "ES_close":{"mus":61, "nCalls":1},"ES_AWD_mus": 591, "ES_AWD":{"mus":591, "nCalls":1},"ES_mus": 668, "ES":{"mus":668, "nCalls":1},"ES_meta2_mus": 0, "ES_meta2":{"mus":0, "nCalls":1},"ES_meta1_mus": 14, "ES_meta1":{"mus":14, "nCalls":1},"ES_meta1_gather_mus": 13, "ES_meta1_gather":{"mus":13, "nCalls":1}, "databytes":0, "metadatabytes":0, "metametadatabytes":0 }
+]

src/pscpy/sample/pfd.000000000.bp/md.0

@@ -96,6 +96,13 @@ def ds_pfd_moments_decoded(ds_pfd_moments_raw) -> xr.Dataset:
     return _decode_dataset(ds_pfd_moments_raw)
 
 
+@pytest.fixture
+def ds_with_time_arr():
+    return pscpy.decode_psc(
+        xr.open_dataset(pscpy.sample_dir / "pfd.000000000.bp"), ["e", "i"]
+    )
+
+
 def test_open_dataset(ds_pfd_decoded):
     assert "jx_ec" in ds_pfd_decoded
     assert ds_pfd_decoded.coords.keys() == set({"x", "y", "z", "t"})
@@ -105,6 +112,10 @@ def test_open_dataset(ds_pfd_decoded):
     )
 
 
+def test_time_arr(ds_with_time_arr):
+    assert np.isclose(ds_with_time_arr.time[0], 0.0)
+
+
 def test_component(ds_pfd_raw, ds_pfd_decoded):
     assert np.all(ds_pfd_raw.jeh.isel(dim_1_9=0).data == ds_pfd_decoded.jx_ec.data)