From 75b0aaaa0c8fdc31854976073affdc267edd9b1e Mon Sep 17 00:00:00 2001 From: biljanaorescanin Date: Fri, 7 Jun 2024 14:29:09 -0400 Subject: [PATCH 1/4] add v12 BCS option --- pre/remap_restart/remap_questions.py | 4 ++-- pre/remap_restart/remap_utils.py | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pre/remap_restart/remap_questions.py b/pre/remap_restart/remap_questions.py index a98688d..af624c0 100755 --- a/pre/remap_restart/remap_questions.py +++ b/pre/remap_restart/remap_questions.py @@ -266,7 +266,7 @@ def ask_questions(): "name": "output:shared:bc_version", "message": message_bc_other_new, "choices": choices_bc_other, - "when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] not in ['v06','v11'], + "when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] not in ['v06','v11','v12'], }, { @@ -274,7 +274,7 @@ def ask_questions(): "name": "output:shared:bc_version", "message": "\nSelect BCs version for new restarts:\n", "choices": choices_bc_other, - "when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] in ['v06','v11'], + "when": lambda x: x["output:shared:bc_version"] == 'Other' and x["input:shared:bc_version"] in ['v06','v11','v12'], }, { diff --git a/pre/remap_restart/remap_utils.py b/pre/remap_restart/remap_utils.py index 3c02635..4cc6bba 100755 --- a/pre/remap_restart/remap_utils.py +++ b/pre/remap_restart/remap_utils.py @@ -36,9 +36,9 @@ choices_bc_ops = ['NL3', 'ICA', 'GM4', 'Other'] -choices_bc_other = ['v06','v11'] +choices_bc_other = ['v06','v11','v12'] -choices_bc_cmd = ['NL3', 'ICA', 'GM4', 'v06', 'v11'] +choices_bc_cmd = ['NL3', 'ICA', 'GM4', 'v06', 'v11','v12'] choices_omodel = ['data', 'MOM5', 'MOM6'] @@ -97,7 +97,8 @@ message_bc_other = f'''\n v06: NL3 + JPL veg height + PEATMAP + MODIS snow alb\n - v11: NL3 + JPL veg height + PEATMAP + MODIS snow alb v2\n\n'''\ + v11: NL3 + JPL veg height + PEATMAP + MODIS snow alb v2\n + v12: NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Argentina peatland fix \n\n'''\ message_bc_other_in = ("Select BCs version of input restarts:\n" + message_bc_other) message_bc_other_new = ("Select BCs version for new restarts:\n" + message_bc_other) From e300eed0320181e5bb7e8407fa56830a06850971 Mon Sep 17 00:00:00 2001 From: biljanaorescanin Date: Fri, 7 Jun 2024 15:57:18 -0400 Subject: [PATCH 2/4] update log --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2e51ec..e0af4a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added +- Added new BCS version v12 + ### Changed - Move to use `time_ave_util.x` from MAPL instead of `time_ave.x` From 58e2d3c92eb2965a841f5fc775344fa39b94a527 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 10 Jun 2024 13:35:07 -0400 Subject: [PATCH 3/4] Update CI to use BCs v11.5.0 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5c89ea6..2848673 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,8 @@ version: 2.1 # Anchors in case we need to override the defaults from the orb -#baselibs_version: &baselibs_version v7.17.0 -#bcs_version: &bcs_version v11.4.0 +#baselibs_version: &baselibs_version v7.24.0 +#bcs_version: &bcs_version v11.5.0 orbs: ci: geos-esm/circleci-tools@2 From 959d5dd52c3c556cea00c9be74ec6522a2ddb057 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Mon, 10 Jun 2024 14:04:37 -0400 Subject: [PATCH 4/4] Use 7.23.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2848673..eeec761 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 # Anchors in case we need to override the defaults from the orb -#baselibs_version: &baselibs_version v7.24.0 +#baselibs_version: &baselibs_version v7.23.0 #bcs_version: &bcs_version v11.5.0 orbs: