configs

Author: Lenka Novakova

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -29,9 +29,8 @@ function hasmoisture(integrator)
     return !(integrator.p.atmos.moisture_model isa CA.DryModel)
 end
 
-function atmos_init(::Type{FT}, atmos_config_dict::Dict) where {FT}
+function atmos_init(::Type{FT}, atmos_config) where {FT}
     # By passing `parsed_args` to `AtmosConfig`, `parsed_args` overwrites the default atmos config
-    atmos_config = CA.AtmosConfig(atmos_config_dict)
     simulation = CA.get_simulation(atmos_config)
     (; integrator) = simulation
     Y = integrator.u

experiments/ClimaEarth/run_amip.jl

@@ -105,6 +105,7 @@ config_dict = merge(parsed_args, config_dict)
 
 ## get component model dictionaries (if applicable)
 config_dict_atmos = get_atmos_config_dict(config_dict)
+atmos_config_object = CA.AtmosConfig(config_dict_atmos)
 
 ## merge dictionaries of command line arguments, coupler dictionary and component model dictionaries
 ## (if there are common keys, the last dictionary in the `merge` arguments takes precedence)
@@ -182,7 +183,7 @@ This uses the `ClimaAtmos.jl` model, with parameterization options specified in
 Utilities.show_memory_usage(comms_ctx)
 
 ## init atmos model component
-atmos_sim = atmos_init(FT, config_dict_atmos);
+atmos_sim = atmos_init(FT, atmos_config_object);
 Utilities.show_memory_usage(comms_ctx)
 
 thermo_params = get_thermo_params(atmos_sim) # TODO: this should be shared by all models #610

experiments/ClimaEarth/run_dry_held_suarez.jl

@@ -84,6 +84,7 @@ config_dict = Dict(
     "coupler_output_dir" => coupler_output_dir,
     "mode_name" => "",
     "run_name" => run_name,
+    "atmos_config_repo" => "ClimaAtmos",
     # timestepping
     "dt" => "$(Δt_cpl)secs",
     "dt_save_to_sol" => "1days",
@@ -109,7 +110,27 @@ config_dict = Dict(
     "surface_setup" => "PrescribedSurface",
     # diagnostic (nested wirh period and short_name)
     "output_default_diagnostics" => false,
-    "diagnostics" => [Dict("short_name" => ["mse", "lr", "mass_streamfunction", "stab", "vT", "egr", "ua", "va", "wa", "ta", "rhoa", "pfull", "stab"], "period" => "1days", "reduction" => "inst"),],
+    "diagnostics" => [
+        Dict(
+            "short_name" => [
+                "mse",
+                "lr",
+                "mass_strf",
+                "stab",
+                "vt",
+                "egr",
+                "ua",
+                "va",
+                "wa",
+                "ta",
+                "rhoa",
+                "pfull",
+                "stab",
+            ],
+            "period" => "1days",
+            "reduction" => "inst",
+        ),
+    ],
     # held-suarez specific
     "forcing" => "held_suarez",
 )
@@ -239,8 +260,7 @@ checkpoint_cb =
     HourlyCallback(dt = FT(480), func = checkpoint_sims, ref_date = [dates.date[1]], active = hourly_checkpoint) # 20 days TODO: not GPU friendly
 update_firstdayofmonth!_cb =
     MonthlyCallback(dt = FT(1), func = update_firstdayofmonth!, ref_date = [dates.date1[1]], active = true)
-callbacks =
-    (; checkpoint = checkpoint_cb, update_firstdayofmonth! = update_firstdayofmonth!_cb)
+callbacks = (; checkpoint = checkpoint_cb, update_firstdayofmonth! = update_firstdayofmonth!_cb)
 
 coupler_online_diagnostics = ()
 
@@ -323,4 +343,4 @@ solve_coupler!(cs);
 # Postprocessing
 anim = true
 energy_check = false
-# include("postprocessing.jl")
+# include("postprocessing.jl")