Merge pull request #75 from GEOS-ESM/feature/borescan_v12_bcs

Add new BCS version
GEOS-ESM · Jun 10, 2024 · d172118 · d172118
2 parents c9407a0 + 959d5dd
commit d172118
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git 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.23.0
+#bcs_version: &bcs_version v11.5.0
 
 orbs:
   ci: geos-esm/circleci-tools@2

diff --git 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`

diff --git a/pre/remap_restart/remap_questions.py b/pre/remap_restart/remap_questions.py
@@ -266,15 +266,15 @@ 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'],
         },
 
         {
             "type": "select",
             "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
@@ -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)