Add surface_setup to AtmosModel

CliMA · Oct 26, 2023 · 5c485b8 · 5c485b8
1 parent 9be6b4e
commit 5c485b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/cache/cache.jl b/src/cache/cache.jl
@@ -10,7 +10,7 @@
 
 # The model also depends on f_plane_coriolis_frequency(params)
 # This is a constant Coriolis frequency that is only used if space is flat
-function build_cache(Y, atmos, params, surface_setup, simulation)
+function build_cache(Y, atmos, params, simulation)
     FT = eltype(params)
 
     ᶜcoord = Fields.local_geometry_field(Y.c).coordinates
@@ -50,7 +50,7 @@ function build_cache(Y, atmos, params, surface_setup, simulation)
         is_init = Ref(true),
         simulation,
         atmos,
-        sfc_setup = surface_setup(params),
+        sfc_setup = atmos.surface_setup(params),
         ᶜΦ,
         ᶠgradᵥ_ᶜΦ = ᶠgradᵥ.(ᶜΦ),
         ᶜρ_ref,

diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl
@@ -73,6 +73,7 @@ function get_atmos(config::AtmosConfig, params)
         rayleigh_sponge = get_rayleigh_sponge_model(parsed_args, params, FT),
         sfc_temperature = get_sfc_temperature_form(parsed_args),
         surface_model = get_surface_model(parsed_args),
+        surface_setup = get_surface_setup(parsed_args),
         numerics = get_numerics(parsed_args),
     )
 
@@ -720,7 +721,6 @@ function get_integrator(config::AtmosConfig)
         CP.log_parameter_information(config.toml_dict, filepath)
     end
     initial_condition = get_initial_condition(config.parsed_args)
-    surface_setup = get_surface_setup(config.parsed_args)
 
     s = @timed_str begin
         if simulation.restart
@@ -740,7 +740,7 @@ function get_integrator(config::AtmosConfig)
     @info "Allocating Y: $s"
 
     s = @timed_str begin
-        p = build_cache(Y, atmos, params, surface_setup, simulation)
+        p = build_cache(Y, atmos, params, simulation)
     end
     @info "Allocating cache (p): $s"
 

diff --git a/src/solver/types.jl b/src/solver/types.jl
@@ -335,6 +335,7 @@ Base.@kwdef struct AtmosModel{
     RS,
     ST,
     SM,
+    SS,
     NUM,
 }
     model_config::MC = nothing
@@ -362,6 +363,7 @@ Base.@kwdef struct AtmosModel{
     rayleigh_sponge::RS = nothing
     sfc_temperature::ST = nothing
     surface_model::SM = nothing
+    surface_setup::SS = nothing
     numerics::NUM = nothing
 end