Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions tests/data/modifyDim.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<netcdf xmlns="http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2" location="nc/example.nc">

<dimension name="newTime" orgName="time"/>

<variable name="time" shape="newTime"/>
<variable name="rh" shape="newTime lat lon"/>
<variable name="T" shape="newTime lat lon"/>
</netcdf>
9 changes: 9 additions & 0 deletions tests/test_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,15 @@ def test_agg_syn_rename():
assert 'Temperature' in ds


def test_rename_dim():
ds = xncml.open_ncml(data / 'modifyDim.xml')
assert 'newTime' in ds.dims
assert 'time' not in ds.dims
assert len(ds['newTime']) == 4
assert ds['time'].dims == ('newTime',)
assert ds['T'].dims == ('newTime', 'lat', 'lon')


def test_rename_var():
ds = xncml.open_ncml(data / 'renameVar.xml')
assert ds.attrs['title'] == 'Example Data'
Expand Down
18 changes: 17 additions & 1 deletion xncml/parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ def read_group(
enums = {} if enums is None else enums
for item in obj.choice:
if isinstance(item, Dimension):
target = rename_dimension(target, ref, item)

dim_name = item.name
if dims.get(dim_name):
dims[dim_name].append(read_dimension(item))
Expand Down Expand Up @@ -541,7 +543,7 @@ def read_variable(
elif obj.shape == '':
out = build_scalar_variable(var_name=var_name, values_tag=obj.values, var_type=obj.type)
else:
error_msg = f'Could not build variable `{var_name }`.'
error_msg = f'Could not build variable `{var_name}`.'
raise ValueError(error_msg)

# Set variable attributes
Expand Down Expand Up @@ -744,6 +746,20 @@ def read_dimension(obj: Dimension) -> Dimension:
return obj


def rename_dimension(target: xr.Dataset, ref: xr.Dataset, obj: Dimension) -> xr.Dataset:
"""Rename dimension in target dataset."""
if obj.org_name:
if obj.org_name in target.dims:
target = target.rename_dims({obj.org_name: obj.name})
elif obj.org_name in ref.dims:
target = target.expand_dims({obj.name: ref.dims[obj.org_name]})
else:
raise ValueError(
f"Dimension '{obj.org_name}' not found in either the target or reference dataset."
)
return target


def nctype(typ: DataType) -> type:
"""Return Python type corresponding to the NcML DataType of object."""

Expand Down