Skip to content

Improve performance of CUDA kernels generated from manual_sparse_jacobian #4093

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
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Improve performance of CUDA kernels generated from manual_sparse_jacobian #4093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5b7e47e
Merge with changes coming from main branch
daverumph Nov 3, 2025
45262f0
Update src/prognostic_equations/implicit/manual_sparse_jacobian.jl
daverumph Nov 11, 2025
91116e9
Update src/prognostic_equations/implicit/manual_sparse_jacobian.jl
daverumph Nov 11, 2025
89adc2b
Update src/prognostic_equations/implicit/manual_sparse_jacobian.jl
daverumph Nov 11, 2025
7d3bdd7
Faster implementation of a couple of lines
daverumph Nov 11, 2025
22d3bab
Run JuliaFormatter
daverumph Nov 11, 2025
d993c03
Change order of calculation in two places of update_jacobian
daverumph Nov 11, 2025
d66c45b
Allocate and use a new scratch scalar to resolve overlapping use
daverumph Nov 11, 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
1 change: 1 addition & 0 deletions src/cache/temporary_quantities.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ function temporary_quantities(Y, atmos)
ᶜtemp_scalar_3 = Fields.Field(FT, center_space),
ᶜtemp_scalar_4 = Fields.Field(FT, center_space),
ᶜtemp_scalar_5 = Fields.Field(FT, center_space),
ᶜtemp_scalar_6 = Fields.Field(FT, center_space),
ᶠtemp_field_level = Fields.level(Fields.Field(FT, face_space), half),
temp_field_level = Fields.level(Fields.Field(FT, center_space), 1),
temp_field_level_2 = Fields.level(Fields.Field(FT, center_space), 1),
Expand Down
22 changes: 13 additions & 9 deletions src/prognostic_equations/implicit/manual_sparse_jacobian.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,11 +619,13 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
FT = eltype(params)
(; vertical_diffusion, smagorinsky_lilly) = p.atmos
(; ᶜp) = p.precomputed
ᶜK_u = p.scratch.ᶜtemp_scalar_4
ᶜK_h = p.scratch.ᶜtemp_scalar_6
if vertical_diffusion isa DecayWithHeightDiffusion
ᶜK_h = ᶜcompute_eddy_diffusivity_coefficient(Y.c.ρ, vertical_diffusion)
ᶜK_h .= ᶜcompute_eddy_diffusivity_coefficient(Y.c.ρ, vertical_diffusion)
ᶜK_u = ᶜK_h
elseif vertical_diffusion isa VerticalDiffusion
ᶜK_h = ᶜcompute_eddy_diffusivity_coefficient(Y.c.uₕ, ᶜp, vertical_diffusion)
ᶜK_h .= ᶜcompute_eddy_diffusivity_coefficient(Y.c.uₕ, ᶜp, vertical_diffusion)
ᶜK_u = ᶜK_h
elseif is_smagorinsky_vertical(smagorinsky_lilly)
set_smagorinsky_lilly_precomputed_quantities!(Y, p, smagorinsky_lilly)
Expand All @@ -634,24 +636,26 @@ function update_jacobian!(alg::ManualSparseJacobian, cache, Y, p, dtγ, t)
ᶜtke⁰ = @. lazy(specific(Y.c.sgs⁰.ρatke, Y.c.ρ))
ᶜmixing_length_field = p.scratch.ᶜtemp_scalar_3
ᶜmixing_length_field .= ᶜmixing_length(Y, p)
ᶜK_u = @. lazy(eddy_viscosity(turbconv_params, ᶜtke⁰, ᶜmixing_length_field))
@. ᶜK_u = eddy_viscosity(turbconv_params, ᶜtke⁰, ᶜmixing_length_field)

ᶜprandtl_nvec = @. lazy(
turbulent_prandtl_number(params, ᶜlinear_buoygrad, ᶜstrain_rate_norm),
)
ᶜK_h = @. lazy(eddy_diffusivity(ᶜK_u, ᶜprandtl_nvec))
@. ᶜK_h = eddy_diffusivity(ᶜK_u, ᶜprandtl_nvec)
end

@. ᶜdiffusion_h_matrix =
ᶜadvdivᵥ_matrix() ⋅ DiagonalMatrixRow(ᶠinterp(ᶜρ) * ᶠinterp(ᶜK_h)) ⋅
ᶠgradᵥ_matrix()
∂ᶠρχ_dif_flux_∂ᶜχ = ᶠp_grad_matrix
@. ∂ᶠρχ_dif_flux_∂ᶜχ =
DiagonalMatrixRow(ᶠinterp(ᶜρ) * ᶠinterp(ᶜK_h)) ⋅ ᶠgradᵥ_matrix()
@. ᶜdiffusion_h_matrix = ᶜadvdivᵥ_matrix() ⋅ ∂ᶠρχ_dif_flux_∂ᶜχ
if (
MatrixFields.has_field(Y, @name(c.sgs⁰.ρatke)) ||
!isnothing(p.atmos.turbconv_model) ||
!disable_momentum_vertical_diffusion(p.atmos.vertical_diffusion)
)
@. ᶜdiffusion_u_matrix =
ᶜadvdivᵥ_matrix() ⋅
@. ∂ᶠρχ_dif_flux_∂ᶜχ =
DiagonalMatrixRow(ᶠinterp(ᶜρ) * ᶠinterp(ᶜK_u)) ⋅ ᶠgradᵥ_matrix()
@. ᶜdiffusion_u_matrix = ᶜadvdivᵥ_matrix() ⋅ ∂ᶠρχ_dif_flux_∂ᶜχ
end

∂ᶜρe_tot_err_∂ᶜρ = matrix[@name(c.ρe_tot), @name(c.ρ)]
Expand Down
Loading