From 76f9f64ca71e854ead5229b733dc26a7e306e1fb Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 17 Oct 2022 12:09:49 -0400 Subject: [PATCH] Add support to pass in ocean type (#51) --- CHANGELOG.md | 6 ++++++ src/commands/create_gcm_expt.yml | 7 ++++++- src/jobs/run_gcm.yml | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ff48f3c..521752a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +## [1.15.0] - 2022-10-17 + +## Added + +- Added `gcm_ocean_type` to GCM experiment to support MOM6 runs + ## [1.14.0] - 2022-10-13 ### Changed diff --git a/src/commands/create_gcm_expt.yml b/src/commands/create_gcm_expt.yml index 0e8f902..1451ab8 100644 --- a/src/commands/create_gcm_expt.yml +++ b/src/commands/create_gcm_expt.yml @@ -21,6 +21,11 @@ parameters: description: "Vertical resolution for gcm experiment" type: integer default: 72 + gcm_ocean_type: + description: "Ocean type for gcm experiment" + type: enum + enum: ["o1", "MOM6"] + default: o1 steps: - run: @@ -29,5 +34,5 @@ steps: TERM: dumb command: | cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.workspace_root >>/install-<< parameters.repo >>/bin - /TinyBCs-GitV10/scripts/create_expt.py << parameters.gcm_experiment_name >> --expdir ${CIRCLE_WORKING_DIRECTORY}/<< parameters.workspace_root >> --horz << parameters.gcm_horz_resolution >> --vert << parameters.gcm_vert_resolution >> + /TinyBCs-GitV10/scripts/create_expt.py << parameters.gcm_experiment_name >> --expdir ${CIRCLE_WORKING_DIRECTORY}/<< parameters.workspace_root >> --horz << parameters.gcm_horz_resolution >> --vert << parameters.gcm_vert_resolution >> --ocean << parameters.gcm_ocean_type >> diff --git a/src/jobs/run_gcm.yml b/src/jobs/run_gcm.yml index 927c0fb..e10429e 100755 --- a/src/jobs/run_gcm.yml +++ b/src/jobs/run_gcm.yml @@ -40,6 +40,11 @@ parameters: description: "Vertical resolution for gcm experiment" type: integer default: 72 + gcm_ocean_type: + description: "Ocean type for gcm experiment" + type: enum + enum: ["o1", "MOM6"] + default: o1 executor: name: << parameters.compiler >>-bcs @@ -58,6 +63,7 @@ steps: gcm_experiment_name: << parameters.gcm_experiment_name >> gcm_horz_resolution: << parameters.gcm_horz_resolution >> gcm_vert_resolution: << parameters.gcm_vert_resolution >> + gcm_ocean_type: << parameters.gcm_ocean_type >> - run_makeoneday: repo: << parameters.repo >> workspace_root: << parameters.workspace_root >>