Skip to content

fix: preserve ScalarDiffusivity halo size during conversion #6093

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
glwagner merged 5 commits into from
Sep 30, 2026
Merged

fix: preserve ScalarDiffusivity halo size during conversion #6093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be74643
fix: preserve ScalarDiffusivity halo size during conversion
RanaPriyansh Sep 28, 2026
99e43a9
Update scalar_diffusivity.jl
simone-silvestri Sep 28, 2026
a743cc6
Merge branch 'main' into fix/5499-scalar-diffusivity-halo
simone-silvestri Sep 28, 2026
b51d21f
Merge branch 'main' into fix/5499-scalar-diffusivity-halo
simone-silvestri Sep 28, 2026
dae3805
Merge remote-tracking branch 'origin/main' into fix/5499-scalar-diffu…
RanaPriyansh Sep 29, 2026
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
4 changes: 2 additions & 2 deletions src/TurbulenceClosures/turbulence_closure_implementations/scalar_diffusivity.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,13 @@ end

Base.show(io::IO, closure::ScalarDiffusivity) = print(io, summary(closure))

function Adapt.adapt_structure(to, closure::ScalarDiffusivity{TD, F, <:Any, <:Any, N}) where {TD, F, N}
function Adapt.adapt_structure(to, closure::ScalarDiffusivity{TD, F, N}) where {TD, F, N}
ν = Adapt.adapt(to, closure.ν)
κ = Adapt.adapt(to, closure.κ)
return ScalarDiffusivity{TD, F, N}(ν, κ)
end

function Architectures.on_architecture(to, closure::ScalarDiffusivity{TD, F, <:Any, <:Any, N}) where {TD, F, N}
function Architectures.on_architecture(to, closure::ScalarDiffusivity{TD, F, N}) where {TD, F, N}
ν = on_architecture(to, closure.ν)
κ = on_architecture(to, closure.κ)
return ScalarDiffusivity{TD, F, N}(ν, κ)
Expand Down
25 changes: 24 additions & 1 deletion test/turbulence_closures/closures.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ using Oceananigans.TurbulenceClosures: CATKEVerticalDiffusivity, RiBasedVertical
LagrangianAveraging,
AnisotropicMinimumDissipation,
IsopycnalSkewSymmetricDiffusivity,
DiffusiveFormulation, AdvectiveFormulation, ThreeDimensionalFormulation
DiffusiveFormulation, AdvectiveFormulation, ThreeDimensionalFormulation,
VerticalFormulation

ConstantSmagorinsky(FT=Float64) = Smagorinsky(FT, coefficient=0.16)
DirectionallyAveragedDynamicSmagorinsky(FT=Float64) = DynamicSmagorinsky(FT, averaging=(1, 2))
Expand Down Expand Up @@ -449,6 +450,28 @@ end
@test required_halo_size_y(closure) == 1
@test required_halo_size_z(closure) == 1

@testset "ScalarDiffusivity architecture conversion preserves halo size" begin
time_discretization = VerticallyImplicitTimeDiscretization()
diffusivity_formulation = VerticalFormulation()
ν = (x, y, z, t) -> 0.3
κ = (x, y, z, t) -> 0.7
for tracer_diffusivities in (κ, (T=κ, S=κ))
closure = ScalarDiffusivity(time_discretization, diffusivity_formulation, Float32;
ν, κ=tracer_diffusivities, required_halo_size=3)
converted_closures = (Adapt.adapt_structure(identity, closure),
on_architecture(CPU(), closure))

for converted in converted_closures
@test required_halo_size_x(converted) == 3
@test required_halo_size_y(converted) == 3
@test required_halo_size_z(converted) == 3
@test converted.ν == closure.ν
@test converted.κ == closure.κ
@test typeof(converted).parameters[1:2] == typeof(closure).parameters[1:2]
end
end
end

closure = ScalarBiharmonicDiffusivity(ν=0.3)
@test required_halo_size_x(closure) == 2
@test required_halo_size_y(closure) == 2
Expand Down
Loading