clean up default config and some function arguments

CliMA · Oct 26, 2023 · 22c0aa5 · 22c0aa5
1 parent 47d3ea2
commit 22c0aa5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/config/default_configs/default_edmf_config.yml b/config/default_configs/default_edmf_config.yml
@@ -1,16 +1,7 @@
 # EDMF configuration
 turbconv:
-  help: "Turbulence convection scheme [`nothing` (default), `edmf`, 'prognostic_edmfx', 'diagnostic_edmfx']"
+  help: "Turbulence convection scheme [`nothing` (default), 'prognostic_edmfx', 'diagnostic_edmfx']"
   value: ~
-test_edmf_consistency:
-  help: "Test edmf equation consistency [`false` (default), `true`]"
-  value: false
-imex_edmf_gm:
-  help: "Whether to split EDMF's `compute_gm_tendencies!` into implicit and explicit components"
-  value: false
-imex_edmf_turbconv:
-  help: "Whether to split EDMF's `compute_turbconv_tendencies!` into implicit and explicit components"
-  value: false
 advection_test:
   help: "Switches off all grid-scale and subgrid-scale momentum tendencies [`false` (default), `true`]"
   value: false

diff --git a/src/cache/cache.jl b/src/cache/cache.jl
@@ -106,11 +106,9 @@ end
 function additional_cache(
     Y,
     default_cache,
-    parsed_args,
     params,
     atmos,
     dt,
-    initial_condition,
 )
     (; precip_model, forcing_type, radiation_mode, turbconv_model) = atmos
 

diff --git a/src/solver/model_getters.jl b/src/solver/model_getters.jl
@@ -335,14 +335,12 @@ end
 
 function get_turbconv_model(
     FT,
-    moisture_model,
-    precip_model,
     parsed_args,
     turbconv_params,
 )
     turbconv = parsed_args["turbconv"]
     @assert turbconv in
-            (nothing, "edmf", "edmfx", "prognostic_edmfx", "diagnostic_edmfx")
+            (nothing, "edmfx", "prognostic_edmfx", "diagnostic_edmfx")
 
     return if turbconv == "prognostic_edmfx"
         N = turbconv_params.updraft_number

diff --git a/src/solver/type_getters.jl b/src/solver/type_getters.jl
@@ -59,8 +59,6 @@ function get_atmos(config::AtmosConfig, params)
         forcing_type,
         turbconv_model = get_turbconv_model(
             FT,
-            moisture_model,
-            precip_model,
             parsed_args,
             turbconv_params,
         ),
@@ -532,11 +530,9 @@ function get_cache(
         additional_cache(
             Y,
             _default_cache,
-            parsed_args,
             params,
             atmos,
             simulation.dt,
-            initial_condition,
         ),
     )
 end