Merge pull request #1082 from CliMA/js/configs

remove unused configs; clean up CI pipeline
CliMA · Nov 13, 2024 · fa5f03b · fa5f03b
2 parents 60136f6 + 1cdfee5
commit fa5f03b
Show file tree

Hide file tree

Showing 24 changed files with 113 additions and 269 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
diff --git a/README.md b/README.md
@@ -56,9 +56,9 @@ julia --project=experiments/ClimaEarth experiments/ClimaEarth/run_amip.jl
 
 When running from the terminal, you can also specify a configuration file to use for the simulation setup, and a job ID to keep track of this run's output.
 Existing configuration files are specified in the `config/` directory within ClimaCoupler.jl.
-For example, to run a coarse AMIP run using Float64, you could use the following command:
+For example, to run the default AMIP configuration, you could use the following command:
 ```julia
-julia --project=experiments/ClimaEarth experiments/ClimaEarth/run_amip.jl --config_file config/ci_configs/coarse_single_ft64.jl --job_id coarse_single_ft64
+julia --project=experiments/ClimaEarth experiments/ClimaEarth/run_amip.jl --config_file config/ci_configs/amip_default.jl --job_id amip_default
 ```
 
 Output from your run will be saved in the folder `experiments/ClimaEarth/output/amip/<job_id>/` for AMIP runs, or
@@ -71,10 +71,10 @@ The output will take up approximately 1GB of space, and the simulation will take
 while running the driver interactively, you'll need to
 manually set the values for `parsed_args["config_file"]` and `parsed_args["job_id"]`.
 
->For example, to use the configuration file found at `config/ci_configs/coarse_single_ft64.yml`, you would use add the following lines in the `run_amip` driver:
+>For example, to use the configuration file found at `config/ci_configs/amip_default.yml`, you would use add the following lines in the `run_amip` driver:
 ```
-parsed_args["config_file"] = "config/ci_configs/coarse_single_ft64.yml"
-parsed_args["job_id"] = "coarse_single_ft64"
+parsed_args["config_file"] = "config/ci_configs/amip_default.yml"
+parsed_args["job_id"] = "amip_default"
 ```
 
 ### A Note about ClimaComms and MPI
@@ -146,3 +146,5 @@ module load common
 
 For additional information about these clusters, including how to gain access for the first time,
 see our slurm-buildkite wiki pages for [Central](https://github.com/CliMA/slurm-buildkite/wiki/Central) and [clima](https://github.com/CliMA/slurm-buildkite/wiki/clima).
+
+## Buildkite pipelines
diff --git a/...i_configs/target_amip_albedo_function.yml → config/ci_configs/amip_albedo_function.yml b/...i_configs/target_amip_albedo_function.yml → config/ci_configs/amip_albedo_function.yml
diff --git a/..._configs/gpu_amip_albedo_temporal_map.yml → ...g/ci_configs/amip_albedo_temporal_map.yml b/..._configs/gpu_amip_albedo_temporal_map.yml → ...g/ci_configs/amip_albedo_temporal_map.yml
diff --git a/...nfigs/gpu_amip_albedo_temporal_map_1M.yml → ...i_configs/amip_albedo_temporal_map_1M.yml b/...nfigs/gpu_amip_albedo_temporal_map_1M.yml → ...i_configs/amip_albedo_temporal_map_1M.yml
diff --git a/config/ci_configs/coarse_single_ft32.yml → config/ci_configs/amip_coarse_ft32.yml b/config/ci_configs/coarse_single_ft32.yml → config/ci_configs/amip_coarse_ft32.yml
diff --git a/...coarse_single_ft64_hourly_checkpoints.yml → ...s/amip_coarse_ft64_hourly_checkpoints.yml b/...coarse_single_ft64_hourly_checkpoints.yml → ...s/amip_coarse_ft64_hourly_checkpoints.yml
diff --git a/...ingle_ft64_hourly_checkpoints_restart.yml → ...oarse_ft64_hourly_checkpoints_restart.yml b/...ingle_ft64_hourly_checkpoints_restart.yml → ...oarse_ft64_hourly_checkpoints_restart.yml
diff --git a/config/ci_configs/coarse_mpi_n4.yml → config/ci_configs/amip_coarse_mpi.yml b/config/ci_configs/coarse_mpi_n4.yml → config/ci_configs/amip_coarse_mpi.yml
diff --git a/.../ci_configs/target_amip_component_dts.yml → config/ci_configs/amip_component_dts.yml b/.../ci_configs/target_amip_component_dts.yml → config/ci_configs/amip_component_dts.yml
diff --git a/...g/ci_configs/gpu_amip_albedo_function.yml → config/ci_configs/amip_default.yml b/...g/ci_configs/gpu_amip_albedo_function.yml → config/ci_configs/amip_default.yml
@@ -6,7 +6,6 @@ dt_save_to_sol: "1days"
 dz_bottom: 30
 dz_top: 3000
 h_elem: 4
-land_albedo_type: "function"
 mode_name: "amip"
 moist: "equil"
 precip_model: "0M"

diff --git a/...ig/ci_configs/target_amip_n1_shortrun.yml → config/ci_configs/amip_n1_shortrun.yml b/...ig/ci_configs/target_amip_n1_shortrun.yml → config/ci_configs/amip_n1_shortrun.yml
diff --git a/...pu_amip_target_topo_diagedmf_shortrun.yml → ...gs/amip_target_topo_diagedmf_shortrun.yml b/...pu_amip_target_topo_diagedmf_shortrun.yml → ...gs/amip_target_topo_diagedmf_shortrun.yml
diff --git a/config/ci_configs/coarse_single_ft64.yml b/config/ci_configs/coarse_single_ft64.yml
diff --git a/config/ci_configs/default_mono.yml b/config/ci_configs/default_mono.yml
diff --git a/config/ci_configs/default_notmono.yml b/config/ci_configs/default_notmono.yml
diff --git a/config/ci_configs/default_unthreaded.yml b/config/ci_configs/default_unthreaded.yml
diff --git a/config/ci_configs/gpu_amip_albedo_static_map.yml b/config/ci_configs/gpu_amip_albedo_static_map.yml
diff --git a/config/ci_configs/regridder_mpi.yml b/config/ci_configs/regridder_mpi.yml
diff --git a/config/ci_configs/slabplanet_albedo_static_map.yml b/config/ci_configs/slabplanet_albedo_static_map.yml
diff --git a/...i_configs/target_params_in_slab_test2.yml → ...configs/slabplanet_realinsol_rayleigh.yml b/...i_configs/target_params_in_slab_test2.yml → ...configs/slabplanet_realinsol_rayleigh.yml
diff --git a/config/ci_configs/target_params_in_slab_test3.yml b/config/ci_configs/target_params_in_slab_test3.yml
diff --git a/experiments/ClimaEarth/run_amip.jl b/experiments/ClimaEarth/run_amip.jl
@@ -93,9 +93,9 @@ parsed_args = parse_commandline(argparse_settings())
 ## modify parsed args for fast testing from REPL #hide
 if isinteractive()
     parsed_args["config_file"] =
-        isnothing(parsed_args["config_file"]) ? joinpath(pkg_dir, "config/ci_configs/coarse_single_ft32.yml") : #interactive_debug.yml") :
+        isnothing(parsed_args["config_file"]) ? joinpath(pkg_dir, "config/ci_configs/interactive_debug.yml") :
         parsed_args["config_file"]
-    parsed_args["job_id"] = "coarse_single_ft32"#"interactive_debug"
+    parsed_args["job_id"] = "interactive_debug"
 end
 
 ## the unique job id should be passed in via the command line

diff --git a/test/mpi_tests/local_checks.sh b/test/mpi_tests/local_checks.sh
@@ -10,7 +10,7 @@ module purge
 module load climacommon/2024_10_09
 
 export CC_PATH=$(pwd)/ # adjust this to the path of your ClimaCoupler.jl directory
-export JOB_ID=coarse_single_ft64_hourly_checkpoints_restart
+export JOB_ID=amip_coarse_ft64_hourly_checkpoints_restart
 export CONFIG_FILE=${CC_PATH}config/ci_configs/${JOB_ID}.yml
 export RESTART_DIR=experiments/ClimaEarth/output/amip/${JOB_ID}/artifacts/