Skip to content

do not expand_dims if dim is already present #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cosunae wants to merge 3 commits into
base: master
Choose a base branch
from
Open

do not expand_dims if dim is already present #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a24ef63
do not expand_dims if dim is already present
Dec 10, 2022
e08a9aa
add a test that check fix of expand_dims works
Jan 4, 2023
f1c8fb3
Merge branch 'master' into fix_expand_dims
iainrussell Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cfgrib/xarray_to_grib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def merge_grib_keys(grib_keys, detected_grib_keys, default_grib_keys):
def expand_dims(data_var: xr.DataArray) -> T.Tuple[T.List[str], xr.DataArray]:
coords_names = [] # type: T.List[str]
for coord_name in dataset.ALL_HEADER_DIMS + ALL_TYPE_OF_LEVELS + dataset.ALL_REF_TIME_KEYS:
if coord_name in data_var.coords and data_var.coords[coord_name].size == 1:
if coord_name in data_var.coords and data_var.coords[coord_name].size == 1 and coord_name not in data_var.dims:
data_var = data_var.expand_dims(coord_name)
if coord_name in data_var.dims:
coords_names.append(coord_name)
Expand Down
22 changes: 22 additions & 0 deletions tests/test_40_xarray_to_grib_regular_ll.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@ def canonic_da() -> xr.DataArray:
)
return da

@pytest.fixture()
def dim_with_length1_da() -> xr.DataArray:
coords: T.List[T.Any] = [
pd.date_range("2018-01-01T00:00", "2018-01-02T12:00", periods=4),
pd.timedelta_range(0, "12h", periods=1),
[1000.0, 850.0, 500.0],
np.linspace(90.0, -90.0, 5),
np.linspace(0.0, 360.0, 6, endpoint=False),
]
da = xr.DataArray(
np.zeros((4, 1, 3, 5, 6)),
coords=coords,
dims=["time", "step", "isobaricInhPa", "latitude", "longitude"],
)
return da

def test_canonical_dataarray_to_grib_with_grib_keys(
canonic_da: xr.DataArray, tmpdir: py.path.local
Expand Down Expand Up @@ -70,3 +85,10 @@ def test_to_grib(canonic_da: xr.DataArray, tmpdir: py.path.local) -> None:
canonic_ds = canonic_da.to_dataset(name="t")
with pytest.warns(FutureWarning):
xarray_to_grib.to_grib(canonic_ds, str(out_path))

def test_canonical_dataarray_to_grib_with_dim_length1(
dim_with_length1_da: xr.DataArray, tmpdir: py.path.local
) -> None:
out_path = tmpdir.join("res.grib")
with open(str(out_path), "wb") as file:
xarray_to_grib.canonical_dataarray_to_grib(dim_with_length1_da, file)