Skip to content

Commit 66e92dc

Browse files
committed
Move precipitation cache to precomputed quantities
1 parent 09770a4 commit 66e92dc

File tree

9 files changed

+411
-425
lines changed

9 files changed

+411
-425
lines changed

src/cache/cache.jl

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ struct AtmosCache{
99
PREC,
1010
SCRA,
1111
HYPE,
12-
PR,
1312
EXTFORCING,
1413
NONGW,
1514
ORGW,
@@ -52,7 +51,6 @@ struct AtmosCache{
5251
hyperdiff::HYPE
5352

5453
"""Additional parameters used by the various tendencies"""
55-
precipitation::PR
5654
external_forcing::EXTFORCING
5755
non_orographic_gravity_wave::NONGW
5856
orographic_gravity_wave::ORGW
@@ -147,8 +145,16 @@ function build_cache(
147145
scratch = temporary_quantities(Y, atmos)
148146

149147
precomputed = precomputed_quantities(Y, atmos)
150-
precomputing_arguments =
151-
(; atmos, core, params, sfc_setup, precomputed, scratch, dt)
148+
precomputing_arguments = (;
149+
atmos,
150+
core,
151+
params,
152+
sfc_setup,
153+
precomputed,
154+
scratch,
155+
dt,
156+
conservation_check,
157+
)
152158

153159
# Coupler compatibility
154160
isnothing(precomputing_arguments.sfc_setup) &&
@@ -168,7 +174,6 @@ function build_cache(
168174
) : ()
169175

170176
hyperdiff = hyperdiffusion_cache(Y, atmos)
171-
precipitation = precipitation_cache(Y, atmos)
172177
external_forcing = external_forcing_cache(Y, atmos, params)
173178
non_orographic_gravity_wave = non_orographic_gravity_wave_cache(Y, atmos)
174179
orographic_gravity_wave = orographic_gravity_wave_cache(Y, atmos)
@@ -186,7 +191,6 @@ function build_cache(
186191
precomputed,
187192
scratch,
188193
hyperdiff,
189-
precipitation,
190194
external_forcing,
191195
non_orographic_gravity_wave,
192196
orographic_gravity_wave,

0 commit comments

Comments
 (0)