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

Fix updraft_top computation on the gpu #2819

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Fix updraft_top computation on the gpu #2819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ steps:
agents:
slurm_gpus: 1
slurm_mem: 20G

- label: "GPU: Prognostic EDMFX aquaplanet"
command: >
julia --color=yes --project=examples examples/hybrid/driver.jl
Expand All @@ -708,7 +708,6 @@ steps:
agents:
slurm_gpus: 1
slurm_mem: 20G
soft_fail: true

- group: "GPU Performance"
steps:
Expand Down
1 change: 1 addition & 0 deletions src/cache/precomputed_quantities.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ function precomputed_quantities(Y, atmos)
ᶜK_u = similar(Y.c, FT),
ᶜK_h = similar(Y.c, FT),
ρatke_flux = similar(Fields.level(Y.f, half), C3{FT}),
ᶜupdraft_top = similar(Fields.level(Y.c, 1), FT),
ᶜuʲs = similar(Y.c, NTuple{n, C123{FT}}),
ᶠu³ʲs = similar(Y.f, NTuple{n, CT3{FT}}),
ᶜKʲs = similar(Y.c, NTuple{n, FT}),
Expand Down
31 changes: 21 additions & 10 deletions src/prognostic_equations/edmfx_closures.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,11 @@ function edmfx_nh_pressure_tendency!(
n = n_mass_flux_subdomains(turbconv_model)
(; params) = p
(; ᶠgradᵥ_ᶜΦ) = p.core
(; ᶜρʲs, ᶠnh_pressure₃ʲs, ᶠu₃⁰) = p.precomputed
(; ᶜρʲs, ᶠnh_pressure₃ʲs, ᶠu₃⁰, ᶜupdraft_top) = p.precomputed
FT = eltype(Y)
ᶜz = Fields.coordinate_field(Y.c).z
z_sfc = Fields.level(Fields.coordinate_field(Y.f).z, Fields.half)
z_sfc_data = Fields.field_values(z_sfc[colidx])
ᶠlg = Fields.local_geometry_field(Y.f)

turbconv_params = CAP.turbconv_params(params)
Expand All @@ -120,16 +121,26 @@ function edmfx_nh_pressure_tendency!(
for j in 1:n

# look for updraft top
updraft_top = FT(0)
ᶜupdraft_top_data = Fields.field_values(ᶜupdraft_top[colidx])
@. ᶜupdraft_top_data = FT(0)
for level in 1:Spaces.nlevels(axes(ᶜz))
if draft_area(
Spaces.level(Y.c.sgsʲs.:($j).ρa[colidx], level)[],
Spaces.level(ᶜρʲs.:($j)[colidx], level)[],
) > a_min
updraft_top = Spaces.level(ᶜz[colidx], level)[]
end
ρaʲ_lev = Fields.field_values(
Spaces.level(Y.c.sgsʲs.:($j).ρa[colidx], level),
)
ρʲ_lev =
Fields.field_values(Spaces.level(ᶜρʲs.:($j)[colidx], level))
ᶜz_lev = Fields.field_values(Spaces.level(ᶜz[colidx], level))
@. ᶜupdraft_top_data = ifelse(
draft_area(ρaʲ_lev, ρʲ_lev) > a_min,
ᶜz_lev,
ᶜupdraft_top_data,
)
end
updraft_top = updraft_top - z_sfc[colidx][]
@. ᶜupdraft_top_data = ᶜupdraft_top_data - z_sfc_data

# There's only one updraft_top per column, so it's
# safe to use at cell centers and cell faces, correct?:
ᶠupdraft_top = Fields.Field(ᶜupdraft_top_data, axes(ᶠu₃⁰[colidx]))

@. ᶠnh_pressure₃ʲs.:($$j)[colidx] = ᶠupdraft_nh_pressure(
params,
Expand All @@ -142,7 +153,7 @@ function edmfx_nh_pressure_tendency!(
),
Y.f.sgsʲs.:($$j).u₃[colidx],
ᶠu₃⁰[colidx],
updraft_top,
ᶠupdraft_top,
)

@. Yₜ.f.sgsʲs.:($$j).u₃[colidx] -= ᶠnh_pressure₃ʲs.:($$j)[colidx]
Expand Down
Loading