clean

Author: LenkaNovak

experiments/ClimaEarth/components/atmosphere/climaatmos.jl

@@ -298,7 +298,7 @@ FluxCalculator.get_surface_params(sim::ClimaAtmosSimulation) = CAP.surface_fluxe
     get_atmos_config_dict(coupler_dict::Dict)
 
 Returns the specified atmospheric configuration (`atmos_config`) overwitten by arguments
-in the coupler dictionary (`config_dict`). The returned dictionary will then be passed to CA.AtmosConfig().
+in the coupler dictionary (`config_dict`). The returned `atmos_config` dictionary will then be passed to CA.AtmosConfig().
 The `atmos_config_repo` flag allows us to
 use a configuration specified within the ClimaCoupler repo, which is useful for direct
 coupled/atmos-only comparisons.
@@ -351,14 +351,18 @@ function get_atmos_config_dict(coupler_dict)
         joinpath(coupler_dict["mode_name"], coupler_dict["run_name"]),
         "clima_atmos",
     )
+
+    # merge configs
+    # (if there are common keys, the last dictionary in the `merge` arguments takes precedence)
     atmos_config = merge(atmos_config, Dict("output_dir" => atmos_output_dir))
+    coupler_config = merge(config_dict_atmos, config_dict)
 
     # set restart file to the initial file saved in this location if it is not nothing
     # TODO this is hardcoded and should be fixed once we have a better restart system
     if !isnothing(atmos_config["restart_file"])
         atmos_config["restart_file"] = replace(atmos_config["restart_file"], "active" => "0000")
     end
-    return atmos_config
+    return atmos_config, coupler_config
 end
 
 

experiments/ClimaEarth/run_amip.jl

@@ -99,16 +99,13 @@ if isinteractive()
         parsed_args["config_file"]
 end
 
-## read in config dictionary from file, overriding the coupler defaults
-## (if there are common keys, the last dictionary in the `merge` arguments takes precedence)
+## read in config dictionary from file, overriding the coupler defaults in `parsed_args`
 config_dict = YAML.load_file(parsed_args["config_file"])
 config_dict = merge(parsed_args, config_dict)
 
 ## get component model dictionaries (if applicable)
-config_dict = get_atmos_config_dict(config_dict)
-
-## merge dictionaries of command line arguments, coupler dictionary and component model dictionaries
-atmos_config_object = CA.AtmosConfig(config_dict)
+atmos_config_dict, config_dict = get_atmos_config_dict(config_dict)
+atmos_config_object = CA.AtmosConfig(atmos_config_dict)
 
 ## read in some parsed command line arguments, required by this script
 mode_name = config_dict["mode_name"]

experiments/ClimaEarth/run_dry_held_suarez.jl

@@ -118,8 +118,8 @@ config_dict = Dict(
 )
 
 ## merge dictionaries of command line arguments, coupler dictionary and component model dictionaries
-config_dict = get_atmos_config_dict(config_dict)
-atmos_config_object = CA.AtmosConfig(config_dict)
+atmos_config_dict, config_dict = get_atmos_config_dict(config_dict)
+atmos_config_object = CA.AtmosConfig(atmos_config_dict)
 
 #=
 ## Setup Communication Context

experiments/ClimaEarth/run_moist_held_suarez.jl

@@ -135,8 +135,8 @@ config_dict = Dict(
 # TODO: need to change moist HS params?
 
 ## merge dictionaries of command line arguments, coupler dictionary and component model dictionaries
-config_dict = get_atmos_config_dict(config_dict)
-atmos_config_object = CA.AtmosConfig(config_dict)
+atmos_config_dict, config_dict = get_atmos_config_dict(config_dict)
+atmos_config_object = CA.AtmosConfig(atmos_config_dict)
 
 #=
 ## Setup Communication Context