Skip to content
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

Jump to bottom

For DSGs, don't attempt to aggregate non-feature axes #730

Merged
merged 6 commits into from
Mar 1, 2024
Merged

For DSGs, don't attempt to aggregate non-feature axes #730

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
13abf44
Fix bad git mess
davidhassell Feb 26, 2024
136ba10
Merge branch 'main' of github.com:NCAS-CMS/cf-python
davidhassell Feb 27, 2024
1022a78
fix merge conflicts
davidhassell Feb 29, 2024
c48eca0
For DSGs, don't aggregate non-feature axes
davidhassell Feb 29, 2024
602f74a
For DSGs, don't aggregate non-feature axes
davidhassell Mar 1, 2024
4f023d6
aggregating_axes
davidhassell Mar 1, 2024
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
52 changes: 32 additions & 20 deletions cf/aggregate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2977,11 +2977,19 @@ def aggregate(
# ------------------------------------------------------------
if axes is None:
# Aggregation will be over as many axes as possible
aggregating_axes = meta[0].axis_ids
m0 = meta[0]
aggregating_axes = m0.axis_ids[:]

# For DSG feature types, only consider aggregating the
# feature dimension(s).
if m0.featureType:
for axis in aggregating_axes[:]:
if not dsg_feature_type_axis(m0, axis):
aggregating_axes.remove(axis)

_create_hash_and_first_values(
meta, None, False, hfl_cache, rtol, atol
meta, aggregating_axes, False, hfl_cache, rtol, atol
)

else:
# Specific aggregation axes have been selected
aggregating_axes = []
Expand Down Expand Up @@ -3484,15 +3492,16 @@ def climatology_cells(


def _create_hash_and_first_values(
meta, axes, donotchecknonaggregatingaxes, hfl_cache, rtol, atol
meta, aggregating_axes, donotchecknonaggregatingaxes, hfl_cache, rtol, atol
):
"""Updates each field's _Meta object.
:Parameters:
meta: `list` of `_Meta`
axes: `None` or `list`
axes: sequence
The identities of the possible aggregating axes.
donotchecknonaggregatingaxes: `bool`
Expand All @@ -3509,6 +3518,9 @@ def _create_hash_and_first_values(
field = m.field
constructs = field.constructs.todict()

# Store the aggregating axis identities
m.aggregating_axes = aggregating_axes

m_sort_keys = m.sort_keys
m_sort_indices = m.sort_indices

Expand All @@ -3527,9 +3539,9 @@ def _create_hash_and_first_values(
# --------------------------------------------------------
for identity in m.axis_ids:
if (
axes is not None
aggregating_axes is not None
and donotchecknonaggregatingaxes
and identity not in axes
and identity not in aggregating_axes
):
x = [None] * len(m.axis[identity]["keys"])
m_hash_values[identity] = x
Expand Down Expand Up @@ -3671,12 +3683,12 @@ def _create_hash_and_first_values(

coord = constructs[key]

axes = aux["axes"]
c_axes = aux["axes"]
canonical_axes = aux["canonical_axes"]
if axes != canonical_axes:
if c_axes != canonical_axes:
# Transpose the N-d auxiliary coordinate so that
# it has the canonical axis order
iaxes = [axes.index(axis) for axis in canonical_axes]
iaxes = [c_axes.index(axis) for axis in canonical_axes]
coord = coord.transpose(iaxes)

sort_indices, needs_sorting = _sort_indices(m, canonical_axes)
Expand Down Expand Up @@ -3722,14 +3734,14 @@ def _create_hash_and_first_values(
else:
for canonical_units, msr in m.msr.items():
hash_values = []
for key, axes, canonical_axes in zip(
for key, c_axes, canonical_axes in zip(
msr["keys"], msr["axes"], msr["canonical_axes"]
):
cell_measure = constructs[key]
if axes != canonical_axes:
if c_axes != canonical_axes:
# Transpose the cell measure so that it has
# the canonical axis order
iaxes = [axes.index(axis) for axis in canonical_axes]
iaxes = [c_axes.index(axis) for axis in canonical_axes]
cell_measure = cell_measure.transpose(iaxes)

sort_indices, needs_sorting = _sort_indices(
Expand Down Expand Up @@ -3836,12 +3848,12 @@ def _create_hash_and_first_values(

field_anc = constructs[key]

axes = anc["axes"]
c_axes = anc["axes"]
canonical_axes = anc["canonical_axes"]
if axes != canonical_axes:
if c_axes != canonical_axes:
# Transpose the field ancillary so that it has the
# canonical axis order
iaxes = [axes.index(axis) for axis in canonical_axes]
iaxes = [c_axes.index(axis) for axis in canonical_axes]
field_anc = field_anc.transpose(iaxes)

sort_indices, needs_sorting = _sort_indices(m, canonical_axes)
Expand Down Expand Up @@ -3874,12 +3886,12 @@ def _create_hash_and_first_values(

domain_anc = constructs[key]

axes = anc["axes"]
c_axes = anc["axes"]
canonical_axes = anc["canonical_axes"]
if axes != canonical_axes:
if c_axes != canonical_axes:
# Transpose the domain ancillary so that it has
# the canonical axis order
iaxes = [axes.index(axis) for axis in canonical_axes]
iaxes = [c_axes.index(axis) for axis in canonical_axes]
domain_anc = domain_anc.transpose(iaxes)

sort_indices, needs_sorting = _sort_indices(m, canonical_axes)
Expand Down Expand Up @@ -4131,7 +4143,7 @@ def _group_fields(meta, axis, info=False):
group is represented by a `list` of `_Meta` objects.
"""
axes = meta[0].axis_ids
axes = meta[0].aggregating_axes

if axes:
if axis in axes:
Expand Down