Merge pull request #3701 from CliMA/ne/config

Fix and test `TargetJobConfig`, remove duplicate config values

Author: nefrathenrici

config/gpu_configs/gpu_aquaplanet_dyamond_ws_1process.yml

@@ -17,7 +17,6 @@ vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"
-rayleigh_sponge: true
 dt: "90secs"
 t_end: "1days"
 toml: [toml/longrun_aquaplanet.toml]

config/gpu_configs/gpu_aquaplanet_dyamond_ws_2process.yml

@@ -17,7 +17,6 @@ vert_diff: "DecayWithHeightDiffusion"
 implicit_diffusion: true
 approximate_linear_solve_iters: 2
 surface_setup: "DefaultMoninObukhov"
-rayleigh_sponge: true
 dt: "90secs"
 t_end: "1days"
 toml: [toml/longrun_aquaplanet.toml]

src/compat.jl

@@ -96,4 +96,3 @@ else
     WallTimeInfo = ClimaUtilities.OnlineLogging.WallTimeInfo
     report_walltime = ClimaUtilities.OnlineLogging.report_walltime
 end
-

src/solver/yaml_helper.jl

@@ -33,12 +33,10 @@ Given a job id string, returns the configuration for that job.
 Does not include the default configuration dictionary.
 """
 function config_from_target_job(target_job)
-    for (job_id, config) in configs_per_config_id()
-        if job_id == target_job
-            return config
-        end
+    # get(configs_per_config_id(), target_job, error("")) doesn't work for some reason
+    for (job_id, config_tuple) in configs_per_config_id()
+        job_id == target_job && return config_tuple.config
     end
-    error("Could not find job with id $target_job")
 end
 
 ContainerType(T) = Union{Tuple{<:T, Vararg{T}}, Vector{<:T}}

test/config.jl

@@ -3,7 +3,17 @@ import ClimaComms
 ClimaComms.@import_required_backends
 import ClimaAtmos as CA
 
-include(joinpath("..", "perf", "common.jl"))
+include(joinpath(pkgdir(CA), "perf", "common.jl"))
+
+@testset "TargetJobConfig" begin
+    dry_barowave_file =
+        joinpath(pkgdir(CA), "config", "model_configs", "baroclinic_wave.yml")
+    target_job_config = TargetJobConfig("baroclinic_wave")
+    file_config = CA.AtmosConfig(dry_barowave_file)
+    @test file_config.parsed_args == target_job_config.parsed_args
+    @test file_config.toml_dict.data == target_job_config.toml_dict.data
+    @test file_config.comms_ctx == target_job_config.comms_ctx
+end
 
 function extract_job_ids(folder_path)
     job_id_dict = Dict()