Skip to content

Commit 4a79ac3

Browse files
foreach_tracer -> foreach_gs_tracer
1 parent 7470f73 commit 4a79ac3

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

src/parameterized_tendencies/les_sgs_models/smagorinsky_lilly.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ function horizontal_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLill
107107
@. Yₜ.c.ρe_tot += wdivₕ(Y.c.ρ * ᶜD_smag * gradₕ(ᶜh_tot))
108108

109109
## Tracer diffusion and associated mass changes
110-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
110+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
111111
ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
112112
ᶜρχₜ_diffusion = @. lazy(wdivₕ(Y.c.ρ * ᶜD_smag * gradₕ(ᶜχ)))
113113
@. ᶜρχₜ += ᶜρχₜ_diffusion
@@ -161,7 +161,7 @@ function vertical_smagorinsky_lilly_tendency!(Yₜ, Y, p, t, ::SmagorinskyLilly)
161161
bottom = Operators.SetValue(C3(FT(0))),
162162
)
163163

164-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
164+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
165165
ᶜ∇ᵥρD∇χₜ = @. lazy(ᶜdivᵥ_ρχ(-(ᶠρ * ᶠD_smag * ᶠgradᵥ(specific(ᶜρχ, Y.c.ρ)))))
166166
@. ᶜρχₜ -= ᶜ∇ᵥρD∇χₜ
167167
# Rain and snow does not affect the mass

src/prognostic_equations/advection.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ NVTX.@annotate function explicit_vertical_advection_tendency!(Yₜ, Y, p, t)
213213
ᶜρ = Y.c.ρ
214214

215215
# Full vertical advection of passive tracers (like liq, rai, etc) ...
216-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
216+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
217217
if !(ρχ_name in (@name(ρe_tot), @name(ρq_tot)))
218218
ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
219219
vtt = vertical_transport(ᶜρ, ᶠu³, ᶜχ, float(dt), tracer_upwinding)

src/prognostic_equations/remaining_tendency.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ NVTX.@annotate function additional_tendency!(Yₜ, Y, p, t)
166166
@. Yₜ.c.ρe_tot += vst_ρe_tot
167167

168168
# TODO: can we write this out explicitly?
169-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
169+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
170170
ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
171171
vst_tracer = viscous_sponge_tendency_tracer(ᶜρ, ᶜχ, viscous_sponge)
172172
@. ᶜρχₜ += vst_tracer

src/prognostic_equations/surface_flux.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function surface_flux_tendency!(Yₜ, Y, p, t)
115115
btt = boundary_tendency_scalar(ᶜh_tot, sfc_conditions.ρ_flux_h_tot)
116116
@. Yₜ.c.ρe_tot -= btt
117117
ρ_flux_χ = p.scratch.sfc_temp_C3
118-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
118+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
119119
ᶜχ = @. lazy(specific(ᶜρχ, Y.c.ρ))
120120
if ρχ_name == @name(ρq_tot)
121121
@. ρ_flux_χ = sfc_conditions.ρ_flux_q_tot

src/prognostic_equations/vertical_diffusion_boundary_layer.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function vertical_diffusion_boundary_layer_tendency!(
100100
top = Operators.SetValue(C3(0)),
101101
bottom = Operators.SetValue(C3(0)),
102102
)
103-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
103+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
104104
if ρχ_name in (@name(ρq_rai), @name(ρq_sno), @name(ρn_rai))
105105
@. ᶜK_h_scaled = α_vert_diff_tracer * ᶜK_h
106106
else

src/utils/variable_manipulations.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ tracer_names(field) =
7373
end
7474

7575
"""
76-
foreach_tracer(f::F, Yₜ, Y) where {F}
76+
foreach_gs_tracer(f::F, Yₜ, Y) where {F}
7777
7878
Applies a given function `f` to each grid-scale scalar variable (except `ρ` and `ρe_tot`)
7979
in the state `Y` and its corresponding tendency `Yₜ`.
@@ -94,7 +94,7 @@ Arguments:
9494
# Example
9595
9696
```julia
97-
foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
97+
foreach_gs_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
9898
# Apply some operation, e.g., a sponge layer
9999
@. ᶜρχₜ += some_sponge_function(ᶜρχ)
100100
if ρχ_name == @name(ρq_tot)
@@ -103,7 +103,7 @@ foreach_tracer(Yₜ, Y) do ᶜρχₜ, ᶜρχ, ρχ_name
103103
end
104104
```
105105
"""
106-
foreach_tracer(f::F, Yₜ, Y) where {F} =
106+
foreach_gs_tracer(f::F, Yₜ, Y) where {F} =
107107
unrolled_foreach(tracer_names(Y.c)) do scalar_name
108108
ᶜρχₜ = MatrixFields.get_field(Yₜ.c, scalar_name)
109109
ᶜρχ = MatrixFields.get_field(Y.c, scalar_name)

0 commit comments

Comments
 (0)