split atmos and coupler configs

clean up CLI args clean land args format rev
CliMA · Sep 21, 2023 · 7ec0b85 · 7ec0b85
1 parent 5f678b9
commit 7ec0b85
Show file tree

Hide file tree

Showing 34 changed files with 142 additions and 186 deletions.
diff --git a/config/longrun_configs/amip_longrun_target.yml b/config/longrun_configs/amip_longrun_target.yml
@@ -1,7 +1,5 @@
 run_name: "amip_longrun_target"
-coupled: true
 anim: true
-surface_setup: "PrescribedSurface"
 dt_cpl: 150
 energy_check: false
 mode_name: "amip"
@@ -21,5 +19,4 @@ t_end: "140days"
 job_id: "amip_longrun_target"
 dt_save_to_sol: "5days"
 dt_save_to_disk: "1days"
-apply_limiter: true
-FLOAT_TYPE: "Float64"
+apply_limiter: true
diff --git a/config/longrun_configs/amip_n1_shortrun.yml b/config/longrun_configs/amip_n1_shortrun.yml
@@ -1,7 +1,5 @@
 job_id: "amip_n1_shortrun"
 run_name: "amip_n1_shortrun"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -17,7 +15,6 @@ alpha_rayleigh_w: 10
 dt_cpl: 150
 dt: "150secs"
 dt_rad: "1hours"
-FLOAT_TYPE: "Float64"
 energy_check: false
 mode_name: "amip"
 t_end: "1days"

diff --git a/config/longrun_configs/amip_n2_shortrun.yml b/config/longrun_configs/amip_n2_shortrun.yml
@@ -1,7 +1,5 @@
 job_id: "amip_n2_shortrun"
 run_name: "amip_n2_shortrun"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -17,7 +15,6 @@ alpha_rayleigh_w: 10
 dt_cpl: 150
 dt: 150secs
 dt_rad: 1hours
-FLOAT_TYPE: "Float64"
 energy_check: false
 mode_name: "amip"
 t_end: "1days"

diff --git a/config/longrun_configs/amip_n32_shortrun.yml b/config/longrun_configs/amip_n32_shortrun.yml
@@ -1,7 +1,5 @@
 job_ide: "amip_n32_shortrun"
 run_name: "amip_n32_shortrun"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -17,7 +15,6 @@ alpha_rayleigh_w: 10
 dt_cpl: 150
 dt: "150secs"
 dt_rad: "1hours"
-FLOAT_TYPE: "Float64"
 energy_check: false
 mode_name: "amip"
 t_end: "10days"

diff --git a/config/longrun_configs/amip_n64_shortrun.yml b/config/longrun_configs/amip_n64_shortrun.yml
@@ -1,7 +1,5 @@
 job_id: "amip_n64_shortrun"
 run_name: "amip_n64_shortrun"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -17,7 +15,6 @@ alpha_rayleigh_w: 10
 dt_cpl: 150
 dt: "150secs"
 dt_rad: "1hours"
-FLOAT_TYPE: "Float64"
 energy_check: false
 mode_name: "amip"
 t_end: "10days"

diff --git a/config/longrun_configs/amip_n8_shortrun.yml b/config/longrun_configs/amip_n8_shortrun.yml
@@ -1,7 +1,5 @@
 job_id: "amip_n8_shortrun"
 run_name: "amip_n8_shortrun"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -17,7 +15,6 @@ alpha_rayleigh_w: 10
 dt_cpl: 150
 dt: "150secs"
 dt_rad: "1hours"
-FLOAT_TYPE: "Float64"
 energy_check: false
 mode_name: "amip"
 t_end: "10days"

diff --git a/config/longrun_configs/slabplanet_default_longrun.yml b/config/longrun_configs/slabplanet_default_longrun.yml
@@ -1,7 +1,4 @@
 run_name: "slabplanet_default_longrun"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/coarse_mpi_n2.yml b/config/model_configs/coarse_mpi_n2.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/coarse_single_modular_ft64.yml b/config/model_configs/coarse_single_modular_ft64.yml
@@ -1,6 +1,4 @@
 run_name: "coarse_single_modular_ft64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -11,7 +9,6 @@ t_end: "10days"
 dt_save_to_sol: "100days"
 dt_cpl: 200
 dt: "200secs"
-FLOAT_TYPE: "Float64"
 mono_surface: true
 h_elem: 6
 dt_save_restart: "10days"

diff --git a/config/model_configs/coarse_single_modular_ft64_monthly_checkpoints.yml b/config/model_configs/coarse_single_modular_ft64_monthly_checkpoints.yml
@@ -1,8 +1,5 @@
 run_name: "coarse_single_modular_ft64_monthly_checkpoints"
-FLOAT_TYPE: "Float64"
-coupled: true
 monthly_checkpoint: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/default_modular_unthreaded.yml b/config/model_configs/default_modular_unthreaded.yml
@@ -1,7 +1,4 @@
 run_name: "default_modular_unthreaded"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/default_mono.yml b/config/model_configs/default_mono.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/default_notmono.yml b/config/model_configs/default_notmono.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/interactive_debug.yml b/config/model_configs/interactive_debug.yml
@@ -0,0 +1,17 @@
+moist: "equil"
+vert_diff: "true"
+rad: "gray"
+energy_check: true
+mode_name: "slabplanet"
+t_end: "10days"
+dt_save_to_sol: "3600secs"
+dt_cpl: 200
+dt: "200secs"
+mono_surface: true
+turb_flux_partition: "CombinedStateFluxes"
+h_elem: 4
+dt_save_restart: "5days"
+precip_model: "0M"
+run_name: "interactive_debug_run"
+job_id: "interactive_debug_run"
+monthly_checkpoint: true
diff --git a/config/model_configs/slabplanet_albedo_function.yml b/config/model_configs/slabplanet_albedo_function.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -13,7 +10,7 @@ dt: "200secs"
 mono_surface: true
 h_elem: 4
 precip_model: "0M"
-albedo_type: "map_static"
+land_albedo_type: "map_static"
 run_name: "slabplanet_albedo_function"
 apply_limiter: true
 job_id: "slabplanet_albedo_function"
diff --git a/config/model_configs/slabplanet_albedo_static_map.yml b/config/model_configs/slabplanet_albedo_static_map.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -13,7 +10,7 @@ dt: "200secs"
 mono_surface: true
 h_elem: 4
 precip_model: "0M"
-albedo_type: "map_static"
+land_albedo_type: "map_static"
 run_name: "slabplanet_albedo_static_map"
 apply_limiter: true
 job_id: "slabplanet_albedo_static_map"
diff --git a/config/model_configs/slabplanet_albedo_temporal_map.yml b/config/model_configs/slabplanet_albedo_temporal_map.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -13,7 +10,7 @@ dt: "200secs"
 mono_surface: true
 h_elem: 4
 precip_model: "0M"
-albedo_type: "map_temporal"
+land_albedo_type: "map_temporal"
 run_name: "slabplanet_albedo_temporal_map"
 apply_limiter: true
 job_id: "slabplanet_albedo_temporal_map"
diff --git a/config/model_configs/slabplanet_default.yml b/config/model_configs/slabplanet_default.yml
@@ -1,7 +1,4 @@
 run_name: "slabplanet_default"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/slabplanet_nonmono.yml b/config/model_configs/slabplanet_nonmono.yml
@@ -1,7 +1,4 @@
 run_name: "slabplanet_nonmono"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/slabplanet_partitioned_fluxes.yml b/config/model_configs/slabplanet_partitioned_fluxes.yml
@@ -1,8 +1,5 @@
 run_name: "slabplanet_partitioned_fluxes"
-FLOAT_TYPE: "Float64"
-coupled: true
 turb_flux_partition: "PartitionedStateFluxes"
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/model_configs/target_amip_n1_shortrun.yml b/config/model_configs/target_amip_n1_shortrun.yml
@@ -1,7 +1,4 @@
 run_name: "target_amip_n1_shortrun"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -17,7 +14,6 @@ alpha_rayleigh_w: 10
 dt_cpl: 150
 dt: "150secs"
 dt_rad: "1hours"
-FLOAT_TYPE: "Float64"
 energy_check: false
 mode_name: "amip"
 t_end: "0.01days"

diff --git a/config/model_configs/target_params_in_slab.yml b/config/model_configs/target_params_in_slab.yml
@@ -1,7 +1,4 @@
-FLOAT_TYPE: "Float64"
 run_name: "target_params_in_slab"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "allskywithclear"

diff --git a/config/model_configs/target_params_in_slab_test2.yml b/config/model_configs/target_params_in_slab_test2.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "allskywithclear"

diff --git a/config/model_configs/target_params_in_slab_test3.yml b/config/model_configs/target_params_in_slab_test3.yml
@@ -1,6 +1,3 @@
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/perf_configs/perf_coarse_single_modular_ft64.yml b/config/perf_configs/perf_coarse_single_modular_ft64.yml
@@ -1,6 +1,4 @@
 run_name: "perf_coarse_single_modular_ft64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -11,7 +9,6 @@ t_end: "10days"
 dt_save_to_sol: "100days"
 dt_cpl: 200
 dt: "200secs"
-FLOAT_TYPE: "Float64"
 mono_surface: true
 h_elem: 6
 dt_save_restart: "10days"

diff --git a/config/perf_configs/perf_default_modular_unthreaded.yml b/config/perf_configs/perf_default_modular_unthreaded.yml
@@ -1,7 +1,4 @@
 run_name: "perf_default_modular_unthreaded"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/perf_configs/perf_diff_coarse_single_modular_ft64.yml b/config/perf_configs/perf_diff_coarse_single_modular_ft64.yml
@@ -1,6 +1,4 @@
 run_name: "perf_diff_coarse_single_modular_ft64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"
@@ -11,7 +9,6 @@ t_end: "10days"
 dt_save_to_sol: "100days"
 dt_cpl: 200
 dt: "200secs"
-FLOAT_TYPE: "Float64"
 mono_surface: true
 h_elem: 6
 dt_save_restart: "10days"

diff --git a/config/perf_configs/perf_diff_default_modular_unthreaded.yml b/config/perf_configs/perf_diff_default_modular_unthreaded.yml
@@ -1,7 +1,4 @@
 run_name: "perf_diff_default_modular_unthreaded"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/config/perf_configs/perf_diff_target_amip_n1_shortrun.yml b/config/perf_configs/perf_diff_target_amip_n1_shortrun.yml
@@ -1,7 +1,4 @@
 run_name: "perf_target_amip_n1_shortrun"
-FLOAT_TYPE: "Float64"
-coupled: true
-surface_setup: "PrescribedSurface"
 moist: "equil"
 vert_diff: "true"
 rad: "gray"

diff --git a/experiments/AMIP/modular/cli_options.jl b/experiments/AMIP/modular/cli_options.jl
@@ -30,14 +30,6 @@ function argparse_settings()
         help = "Method to partition turbulent fluxes. [`PartitionedStateFluxes`, `CombinedStateFluxes`]"
         arg_type = String
         default = "CombinedStateFluxes"
-        "--albedo_type"
-        help = "Access land surface albedo information from data file. [`function`, `map_static`, `map_temporal`]"
-        arg_type = String
-        default = "map_static"
-        "--coupled" # TODO - remove from Atmos
-        help = "Coupled simulation [`false` (default), `true`]"
-        arg_type = Bool
-        default = true
         "--monthly_checkpoint" # TODO generalize to any frequency
         help = "Boolean flag indicating whether to checkpoint monthly"
         arg_type = Bool
@@ -50,9 +42,32 @@ function argparse_settings()
         help = "Restart time"
         arg_type = Int
         default = 0
-        # ClimaAtmos flag
         "--config_file"
-        help = "A yaml file used to set model configurations"
+        help = "A yaml file used to set the configuration of the coupled model"
+        "--print_config_dict"
+        help = "Boolean flag indicating whether to print the final configuration dictionary"
+        arg_type = Bool
+        default = true
+        "--FLOAT_TYPE"
+        help = "Floating point precision  [`Float64` (default), `Float32`]"
+        arg_type = String
+        default = "Float64"
+        # ClimaAtmos specific
+        "--surface_setup"
+        help = "Triggers ClimaAtmos into the coupled mode [`PrescribedSurface` (default)]" # retained here for standalone Atmos benchmarks
+        arg_type = String
+        default = "PrescribedSurface"
+        "--atmos_config_file"
+        help = "A yaml file used to set the atmospheric model configuration. If nothing is specified, the default configuration is used."
+        # ClimaLSM specific
+        "--land_albedo_type"
+        help = "Access land surface albedo information from data file. [`function`, `map_static`, `map_temporal`]"
+        arg_type = String
+        default = "map_static" # to be replaced by land config file, when available
+        "--land_domain_type"
+        help = "Type of land domain. [`sphere` (default), `single_column`]"
+        arg_type = String
+        default = "sphere"
     end
     return s
 end