Merge branch 'main' into feature/wjiang/bill_remap_upper_stretched_cube_in

Author: mathomp4

.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

CHANGELOG.md

@@ -9,9 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- Added choice 'blank' for qos in remap_restart python pacakage
-- Added hydrostatic question in remap_restart python pacakage
+- Added choice 'blank' for qos in remap_restart python package
+- Added hydrostatic question in remap_restart python package
 - Added function to remap from stretched restarts to stretched restarts
+- Added new BCS version v12
 
 ### Changed
 

pre/remap_restart/remap_questions.py

@@ -276,15 +276,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'],
         },
 
         {

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)