Skip to content

Type tweaks: WrappedHaloUpdater + explicit parameter passing #96

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

Merged
jjuyeonkim merged 2 commits into from
Oct 29, 2025
Merged

Type tweaks: WrappedHaloUpdater + explicit parameter passing #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
235c715
Type tweaks: WrappedHaloUpdater + explicit parameter passing
jjuyeonkim Oct 28, 2025
d797830
Merge branch 'develop' into 20251028_type_adj
jjuyeonkim Oct 28, 2025
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
6 changes: 5 additions & 1 deletion pyfv3/stencils/dyn_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,11 @@ def __init__(
["pkc"],
)
else:
self.pkc = comm.get_scalar_halo_updater([full_size_xyzi_halo_spec])
self.pkc = WrappedHaloUpdater(
comm.get_scalar_halo_updater([full_size_xyzi_halo_spec]),
{"pkc": pkc},
["pkc"],
)
self.uc__vc = WrappedHaloUpdater(
comm.get_vector_halo_updater(
[full_size_xiyz_halo_spec], [full_size_xyiz_halo_spec]
Expand Down
41 changes: 28 additions & 13 deletions pyfv3/stencils/fxadv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,15 +538,9 @@ def __init__(
origin = grid_indexing.origin_full()
domain = grid_indexing.domain_full()
ax_offsets = grid_indexing.axis_offsets(origin, domain)
kwargs = {"externals": ax_offsets, "origin": origin, "domain": domain}
origin_corners = grid_indexing.origin_full(add=(1, 1, 0))
domain_corners = grid_indexing.domain_full(add=(-1, -1, 0))
corner_offsets = grid_indexing.axis_offsets(origin_corners, domain_corners)
kwargs_corners = {
"externals": corner_offsets,
"origin": origin_corners,
"domain": domain_corners,
}
self._main_uc_vc_contra_stencil = stencil_factory.from_origin_domain(
main_uc_vc_contra,
externals={"grid_type": grid_type, **ax_offsets},
Expand All @@ -555,25 +549,46 @@ def __init__(
)
if self._grid_type < 3:
self._uc_contra_y_edge_stencil = stencil_factory.from_origin_domain(
uc_contra_y_edge, **kwargs
uc_contra_y_edge,
externals=ax_offsets,
origin=origin,
domain=domain,
)
self._vc_contra_y_edge_stencil = stencil_factory.from_origin_domain(
vc_contra_y_edge, **kwargs
vc_contra_y_edge,
externals=ax_offsets,
origin=origin,
domain=domain,
)
self._vc_contra_x_edge_stencil = stencil_factory.from_origin_domain(
vc_contra_x_edge, **kwargs
vc_contra_x_edge,
externals=ax_offsets,
origin=origin,
domain=domain,
)
self._uc_contra_x_edge_stencil = stencil_factory.from_origin_domain(
uc_contra_x_edge, **kwargs
uc_contra_x_edge,
externals=ax_offsets,
origin=origin,
domain=domain,
)
self._uc_contra_corners_stencil = stencil_factory.from_origin_domain(
uc_contra_corners, **kwargs_corners
uc_contra_corners,
externals=corner_offsets,
origin=origin_corners,
domain=domain_corners,
)
self._vc_contra_corners_stencil = stencil_factory.from_origin_domain(
vc_contra_corners, **kwargs_corners
vc_contra_corners,
externals=corner_offsets,
origin=origin_corners,
domain=domain_corners,
)
self._fxadv_fluxes_stencil = stencil_factory.from_origin_domain(
fxadv_fluxes_stencil, **kwargs
fxadv_fluxes_stencil,
externals=ax_offsets,
origin=origin,
domain=domain,
)
# self._set_nans = get_set_nan_func(
# grid_indexing,
Expand Down