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

Reduce allocations #539

Merged
merged 1 commit into from
Nov 8, 2021
Merged

Reduce allocations #539

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
9 changes: 6 additions & 3 deletions src/Operators.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ function upwind_advection_area(ρ0_half, a_up, w_up, grid, k)
a_up_cut = ccut_upwind(a_up, grid, k)
w_up_cut = daul_f2c_upwind(w_up, grid, k)
m_cut = ρ_0_cut .* a_up_cut .* w_up_cut
∇m = c∇_upwind(m_cut, grid, k; bottom = SetValue(0), top = SetGradient(0))
FT = eltype(grid)
∇m = c∇_upwind(m_cut, grid, k; bottom = SetValue(FT(0)), top = SetGradient(FT(0)))
return -∇m / ρ0_half[k]
end

Expand All @@ -175,7 +176,8 @@ function upwind_advection_velocity(ρ0, a_up, w_up, grid, k; a_up_bcs)
ρ_0_dual = fcut_upwind(ρ0, grid, k)
w_up_dual = fcut_upwind(w_up, grid, k)
adv_dual = a_dual .* ρ_0_dual .* w_up_dual .* w_up_dual
∇ρaw = f∇_onesided(adv_dual, grid, k; bottom = FreeBoundary(), top = SetGradient(0))
FT = eltype(grid)
∇ρaw = f∇_onesided(adv_dual, grid, k; bottom = FreeBoundary(), top = SetGradient(FT(0)))
return ∇ρaw
end

Expand All @@ -185,7 +187,8 @@ function upwind_advection_scalar(ρ0_half, a_up, w_up, var, grid, k)
w_up_cut = daul_f2c_upwind(w_up, grid, k)
var_cut = ccut_upwind(var, grid, k)
m_cut = ρ_0_cut .* a_up_cut .* w_up_cut .* var_cut
∇m = c∇_upwind(m_cut, grid, k; bottom = SetValue(0), top = SetGradient(0))
FT = eltype(grid)
∇m = c∇_upwind(m_cut, grid, k; bottom = SetValue(FT(0)), top = SetGradient(FT(0)))
return ∇m
end

Expand Down
131 changes: 70 additions & 61 deletions src/Turbulence_PrognosticTKE.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,10 @@ function update(edmf::EDMF_PrognosticTKE, grid, state, gm::GridMeanVariables, Ca
compute_gm_tendencies!(edmf, grid, state, Case, gm, TS)
compute_updraft_tendencies(edmf, grid, state, gm)

compute_en_tendencies!(edmf, grid, state, param_set, TS, :tke, :ρatke, n_updrafts)
compute_en_tendencies!(edmf, grid, state, param_set, TS, :Hvar, :ρaHvar, n_updrafts)
compute_en_tendencies!(edmf, grid, state, param_set, TS, :QTvar, :ρaQTvar, n_updrafts)
compute_en_tendencies!(edmf, grid, state, param_set, TS, :HQTcov, :ρaHQTcov, n_updrafts)
compute_en_tendencies!(edmf, grid, state, param_set, TS, Val(:tke), Val(:ρatke))
compute_en_tendencies!(edmf, grid, state, param_set, TS, Val(:Hvar), Val(:ρaHvar))
compute_en_tendencies!(edmf, grid, state, param_set, TS, Val(:QTvar), Val(:ρaQTvar))
compute_en_tendencies!(edmf, grid, state, param_set, TS, Val(:HQTcov), Val(:ρaHQTcov))

###
### update (to be removed)
Expand Down Expand Up @@ -655,13 +655,13 @@ function compute_covariance_interdomain_src(
end

function compute_covariance_entr(
edmf::EDMF_PrognosticTKE,
edmf::EDMF_PrognosticTKE{N_up},
grid,
state,
covar_sym::Symbol,
var1::Symbol,
var2::Symbol = var1,
)
::Val{covar_sym},
v1::Val{var1},
v2::Val{var2} = v1,
) where {covar_sym, var1, var2, N_up}

ρ0_c = center_ref_state(state).ρ0

Expand All @@ -683,44 +683,44 @@ function compute_covariance_entr(
aux_en = is_tke ? aux_en_f : aux_en_c
EnvVar1 = getproperty(aux_en, var1)
EnvVar2 = getproperty(aux_en, var2)

@inbounds for k in real_center_indices(grid)
aux_covar.entr_gain[k] = 0.0
aux_covar.detr_loss[k] = 0.0
@inbounds for i in 1:(edmf.n_updrafts)
a_up = aux_up[i].area[k]
entr_gain = aux_covar.entr_gain
detr_loss = aux_covar.detr_loss

@inbounds for i in 1:N_up
aux_up_i = aux_up[i]
frac_turb_entr = aux_up_i.frac_turb_entr
detr_sc = aux_up_i.detr_sc
entr_sc = aux_up_i.entr_sc
w_up = aux_up_f[i].w
prog_up_i = prog_up[i]
@inbounds for k in real_center_indices(grid)
entr_gain[k] = 0
detr_loss[k] = 0
a_up = aux_up_i.area[k]
if a_up > edmf.minimum_area
R_up = edmf.pressure_plume_spacing[i]
up_var_1 = getproperty(prog_up[i], var1)
up_var_2 = getproperty(prog_up[i], var2)
up_var_1 = getproperty(prog_up_i, var1)
up_var_2 = getproperty(prog_up_i, var2)
updvar1 = is_tke ? interpf2c(up_var_1, grid, k) : up_var_1[k]
updvar2 = is_tke ? interpf2c(up_var_2, grid, k) : up_var_2[k]
envvar1 = is_tke ? interpf2c(EnvVar1, grid, k) : EnvVar1[k]
envvar2 = is_tke ? interpf2c(EnvVar2, grid, k) : EnvVar2[k]
gmvvar1 = is_tke ? interpf2c(GmvVar1, grid, k) : GmvVar1[k]
gmvvar2 = is_tke ? interpf2c(GmvVar2, grid, k) : GmvVar2[k]

eps_turb = aux_up[i].frac_turb_entr[k]
eps_turb = frac_turb_entr[k]

w_u = interpf2c(aux_up_f[i].w, grid, k)
w_u = interpf2c(w_up, grid, k)
dynamic_entr =
tke_factor *
ρ0_c[k] *
a_up *
abs(w_u) *
aux_up[i].detr_sc[k] *
(updvar1 - envvar1) *
(updvar2 - envvar2)
tke_factor * ρ0_c[k] * a_up * abs(w_u) * detr_sc[k] * (updvar1 - envvar1) * (updvar2 - envvar2)
turbulent_entr =
tke_factor *
ρ0_c[k] *
a_up *
abs(w_u) *
eps_turb *
((envvar1 - gmvvar1) * (updvar2 - envvar2) + (envvar2 - gmvvar2) * (updvar1 - envvar1))
aux_covar.entr_gain[k] += dynamic_entr + turbulent_entr
aux_covar.detr_loss[k] +=
tke_factor * ρ0_c[k] * a_up * abs(w_u) * (aux_up[i].entr_sc[k] + eps_turb) * covar[k]
entr_gain[k] += dynamic_entr + turbulent_entr
detr_loss[k] += tke_factor * ρ0_c[k] * a_up * abs(w_u) * (entr_sc[k] + eps_turb) * covar[k]
end
end
end
Expand All @@ -737,14 +737,16 @@ function compute_covariance_detr(edmf::EDMF_PrognosticTKE, grid, state, covar_sy
aux_up = center_aux_updrafts(state)
aux_en = center_aux_environment(state)
covar = getproperty(aux_en, covar_sym)
detr_loss = aux_covar.detr_loss
Ic = CCO.InterpolateF2C()

@inbounds for k in real_center_indices(grid)
aux_covar.detr_loss[k] = 0.0
@inbounds for i in 1:(up.n_updrafts)
w_up_c = interpf2c(aux_up_f[i].w, grid, k)
aux_covar.detr_loss[k] += aux_up[i].area[k] * abs(w_up_c) * aux_up[i].entr_sc[k]
end
aux_covar.detr_loss[k] *= ρ0_c[k] * covar[k]
parent(detr_loss) .= 0
@inbounds for i in 1:(up.n_updrafts)
aux_up_i = aux_up[i]
area_up = aux_up_i.area
entr_sc = aux_up_i.entr_sc
w_up = aux_up_f[i].w
@. detr_loss += ρ0_c * covar * area_up * abs(Ic(w_up)) * entr_sc
end
return
end
Expand All @@ -759,17 +761,24 @@ function compute_covariance_dissipation(edmf::EDMF_PrognosticTKE, grid, state, c
aux_en_2m = center_aux_environment_2m(state)
aux_covar = getproperty(aux_en_2m, covar_sym)
covar = getproperty(aux_en, covar_sym)
dissipation = aux_covar.dissipation
area_en = aux_en.area
tke_en = aux_en.tke
mixing_length = aux_tc.mixing_length

@inbounds for k in real_center_indices(grid)
aux_covar.dissipation[k] = (
ρ0_c[k] * aux_en.area[k] * covar[k] * max(aux_en.tke[k], 0)^0.5 / max(aux_tc.mixing_length[k], 1.0e-3) *
c_d
)
end
@. dissipation = ρ0_c * area_en * covar * max(tke_en, 0)^0.5 / max(mixing_length, 1.0e-3) * c_d
return
end

function compute_en_tendencies!(edmf, grid::Grid, state, param_set, TS, covar_sym::Symbol, prog_sym::Symbol, n_updrafts)
function compute_en_tendencies!(
edmf::EDMF_PrognosticTKE{N_up},
grid::Grid,
state,
param_set,
TS,
::Val{covar_sym},
::Val{prog_sym},
) where {N_up, covar_sym, prog_sym}
kc_surf = kc_surface(grid)
kc_toa = kc_top_of_atmos(grid)
ρ0_c = center_ref_state(state).ρ0
Expand Down Expand Up @@ -798,6 +807,12 @@ function compute_en_tendencies!(edmf, grid::Grid, state, param_set, TS, covar_sy
ae = 1 .- aux_bulk.area
aeK = is_tke ? ae .* KM : ae .* KH

press = aux_covar.press
buoy = aux_covar.buoy
shear = aux_covar.shear
entr_gain = aux_covar.entr_gain
rain_src = aux_covar.rain_src

cartvec = CC.Geometry.Cartesian3Vector(zero(FT))
aeK_bcs = (; bottom = CCO.SetValue(aeK[kc_surf]), top = CCO.SetValue(aeK[kc_toa]))
prog_bcs = (; bottom = CCO.SetGradient(cartvec), top = CCO.SetGradient(cartvec))
Expand All @@ -814,13 +829,15 @@ function compute_en_tendencies!(edmf, grid::Grid, state, param_set, TS, covar_sy
ρaew_en_ϕ = center_aux_turbconv(state).ρaew_en_ϕ

Ic = CCO.InterpolateF2C()
@. ρaew_en_ϕ = ρ0_c * aux_en.area * Ic(w_en_f) * covar
area_en = aux_en.area
tke_en = aux_en.tke
@. ρaew_en_ϕ = ρ0_c * area_en * Ic(w_en_f) * covar

kc_surf = kc_surface(grid)
covar_surf = covar[kc_surf]
prog_covar[kc_surf] = covar[kc_surf]

@inbounds for k in real_center_indices(grid)
D_env = sum(1:n_updrafts) do i
is_surface_center(grid, k) && continue
D_env = sum(1:N_up) do i
if aux_up[i].area[k] > minimum_area
turb_entr = aux_up[i].frac_turb_entr[k]
entr_sc = aux_up[i].entr_sc[k]
Expand All @@ -832,20 +849,12 @@ function compute_en_tendencies!(edmf, grid::Grid, state, param_set, TS, covar_sy
end
D_env_i
end
dissipation = ρ0_c[k] * aux_en.area[k] * c_d * sqrt(max(aux_en.tke[k], 0)) / max(mixing_length[k], 1)
dissipation = ρ0_c[k] * area_en[k] * c_d * sqrt(max(tke_en[k], 0)) / max(mixing_length[k], 1)
ρaew_en_ϕ_cut = ccut_downwind(ρaew_en_ϕ, grid, k)
∇ρaew_en_ϕ = c∇_downwind(ρaew_en_ϕ_cut, grid, k; bottom = FreeBoundary(), top = SetGradient(0))
if is_surface_center(grid, k)
prog_covar[k] = covar_surf
else
prog_covar[k] = (
aux_covar.press[k] +
aux_covar.buoy[k] +
aux_covar.shear[k] +
aux_covar.entr_gain[k] +
aux_covar.rain_src[k] - D_env * covar[k] - dissipation * covar[k] - ∇ρaew_en_ϕ + ∇ρ_ae_K∇ϕ[k]
)
end
∇ρaew_en_ϕ = c∇_downwind(ρaew_en_ϕ_cut, grid, k; bottom = FreeBoundary(), top = SetGradient(FT(0)))
prog_covar[k] =
press[k] + buoy[k] + shear[k] + entr_gain[k] + rain_src[k] - D_env * covar[k] - dissipation * covar[k] -
∇ρaew_en_ϕ + ∇ρ_ae_K∇ϕ[k]
end

return nothing
Expand Down
4 changes: 2 additions & 2 deletions src/types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,7 +391,7 @@ end

CasesBase(case::T; kwargs...) where {T} = CasesBase{T}(; casename = string(nameof(T)), kwargs...)

mutable struct EDMF_PrognosticTKE{A1}
mutable struct EDMF_PrognosticTKE{N_up, A1}
Ri_bulk_crit::Float64
zi::Float64
n_updrafts::Int
Expand Down Expand Up @@ -525,7 +525,7 @@ mutable struct EDMF_PrognosticTKE{A1}
entr_surface_bc = 0
detr_surface_bc = 0
A1 = typeof(area_surface_bc)
return new{A1}(
return new{n_updrafts, A1}(
Ri_bulk_crit,
zi,
n_updrafts,
Expand Down
8 changes: 4 additions & 4 deletions src/update_aux.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ function update_aux!(edmf, gm, grid, state, Case, param_set, TS)
aux_en_2m.tke.buoy[k] = -ml_model.a_en * ρ0_c[k] * KH[k] * bg.∂b∂z
end

compute_covariance_entr(edmf, grid, state, :tke, :w)
compute_covariance_entr(edmf, grid, state, Val(:tke), Val(:w))
compute_covariance_shear(edmf, grid, state, gm, :tke, :w)
compute_covariance_interdomain_src(edmf, grid, state, :tke, :w)

Expand All @@ -487,9 +487,9 @@ function update_aux!(edmf, gm, grid, state, Case, param_set, TS)
end
end

compute_covariance_entr(edmf, grid, state, :Hvar, :θ_liq_ice)
compute_covariance_entr(edmf, grid, state, :QTvar, :q_tot)
compute_covariance_entr(edmf, grid, state, :HQTcov, :θ_liq_ice, :q_tot)
compute_covariance_entr(edmf, grid, state, Val(:Hvar), Val(:θ_liq_ice))
compute_covariance_entr(edmf, grid, state, Val(:QTvar), Val(:q_tot))
compute_covariance_entr(edmf, grid, state, Val(:HQTcov), Val(:θ_liq_ice), Val(:q_tot))
compute_covariance_shear(edmf, grid, state, gm, :Hvar, :θ_liq_ice)
compute_covariance_shear(edmf, grid, state, gm, :QTvar, :q_tot)
compute_covariance_shear(edmf, grid, state, gm, :HQTcov, :θ_liq_ice, :q_tot)
Expand Down