From fbabe523fa02fc5f1540346ed989c92f35865d63 Mon Sep 17 00:00:00 2001
From: biljanaorescanin <biljana.orescanin@nasa.gov>
Date: Fri, 7 Jun 2024 14:33:15 -0400
Subject: [PATCH 1/4] moving to v12, same as v11 with bug fix

---
 gcm_setup          | 8 ++++----
 geoschemchem_setup | 8 ++++----
 gmichem_setup      | 8 ++++----
 stratchem_setup    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gcm_setup b/gcm_setup
index 5b64a216..08c2dcdb 100755
--- a/gcm_setup
+++ b/gcm_setup
@@ -1413,7 +1413,7 @@ endif
 # Enter Land Surface Model Boundary Conditions
 # -----------------------------------------------------------
 LSM_BCS:
-echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v11${CN}"
+echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v12${CN}"
 set   LSM_BCS  = $<
 if( .$LSM_BCS == . ) set LSM_BCS = "NL3"
 if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "ica" ) then
@@ -1430,8 +1430,8 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "nl3" ) then
     set EMIP_OLDLAND = "#DELETE"
     set EMIP_NEWLAND = ""
     set EMIP_MERRA2  = "MERRA2_NewLand"
-else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
-    set LSM_BCS      = "v11"
+else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v12" ) then
+    set LSM_BCS      = "v12"
     set LSM_PARMS    = ""
     set EMIP_BCS_IN  = "NL3"
     set EMIP_OLDLAND = "#DELETE"
@@ -1439,7 +1439,7 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
     set EMIP_MERRA2  = "MERRA2_NewLand"
 else
     echo
-    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v11${CN}!"
+    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v12${CN}!"
     goto LSM_BCS
 endif
 
diff --git a/geoschemchem_setup b/geoschemchem_setup
index 52824274..04d5ff61 100755
--- a/geoschemchem_setup
+++ b/geoschemchem_setup
@@ -1428,7 +1428,7 @@ endif
 # Enter Land Surface Model Boundary Conditions
 # -----------------------------------------------------------
 LSM_BCS:
-echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v11${CN}"
+echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v12${CN}"
 set   LSM_BCS  = $<
 if( .$LSM_BCS == . ) set LSM_BCS = "NL3"
 if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "ica" ) then
@@ -1445,8 +1445,8 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "nl3" ) then
     set EMIP_OLDLAND = "#DELETE"
     set EMIP_NEWLAND = ""
     set EMIP_MERRA2  = "MERRA2_NewLand"
-else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
-    set LSM_BCS      = "v11"
+else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v12" ) then
+    set LSM_BCS      = "v12"
     set LSM_PARMS    = ""
     set EMIP_BCS_IN  = "NL3"
     set EMIP_OLDLAND = "#DELETE"
@@ -1454,7 +1454,7 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
     set EMIP_MERRA2  = "MERRA2_NewLand"
 else
     echo
-    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v11${CN}!"
+    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v12${CN}!"
     goto LSM_BCS
 endif
 
diff --git a/gmichem_setup b/gmichem_setup
index 5aca5d2b..53f47f7d 100755
--- a/gmichem_setup
+++ b/gmichem_setup
@@ -1525,7 +1525,7 @@ endif
 # Enter Land Surface Model Boundary Conditions
 # -----------------------------------------------------------
 LSM_BCS:
-echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v11${CN}"
+echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v12${CN}"
 set   LSM_BCS  = $<
 if( .$LSM_BCS == . ) set LSM_BCS = "NL3"
 if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "ica" ) then
@@ -1542,8 +1542,8 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "nl3" ) then
     set EMIP_OLDLAND = "#DELETE"
     set EMIP_NEWLAND = ""
     set EMIP_MERRA2  = "MERRA2_NewLand"
-else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
-    set LSM_BCS      = "v11"
+else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v12" ) then
+    set LSM_BCS      = "v12"
     set LSM_PARMS    = ""
     set EMIP_BCS_IN  = "NL3"
     set EMIP_OLDLAND = "#DELETE"
@@ -1551,7 +1551,7 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
     set EMIP_MERRA2  = "MERRA2_NewLand"
 else
     echo
-    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v11${CN}!"
+    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v12${CN}!"
     goto LSM_BCS
 endif
 
diff --git a/stratchem_setup b/stratchem_setup
index 80230ed8..516f02a4 100755
--- a/stratchem_setup
+++ b/stratchem_setup
@@ -1428,7 +1428,7 @@ endif
 # Enter Land Surface Model Boundary Conditions
 # -----------------------------------------------------------
 LSM_BCS:
-echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v11${CN}"
+echo "Enter the choice of ${C1} Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Default: Icarus-NLv3), or ${C2}v12${CN}"
 set   LSM_BCS  = $<
 if( .$LSM_BCS == . ) set LSM_BCS = "NL3"
 if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "ica" ) then
@@ -1445,8 +1445,8 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "nl3" ) then
     set EMIP_OLDLAND = "#DELETE"
     set EMIP_NEWLAND = ""
     set EMIP_MERRA2  = "MERRA2_NewLand"
-else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
-    set LSM_BCS      = "v11"
+else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v12" ) then
+    set LSM_BCS      = "v12"
     set LSM_PARMS    = ""
     set EMIP_BCS_IN  = "NL3"
     set EMIP_OLDLAND = "#DELETE"
@@ -1454,7 +1454,7 @@ else if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "v11" ) then
     set EMIP_MERRA2  = "MERRA2_NewLand"
 else
     echo
-    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v11${CN}!"
+    echo "${C1} Land Surface Boundary Conditions${CN} must be set equal to ${C2}ICA (Icarus)${CN}, ${C2}NL3 (Icarus-NLv3)${CN}, or ${C2}v12${CN}!"
     goto LSM_BCS
 endif
 

From 3260fe8fcf512716526357b8d0314a282a87c55a Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 10 Jun 2024 13:02:25 -0400
Subject: [PATCH 2/4] Test CI Fix

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be7043b3..84620ec0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2.1
 #bcs_version: &bcs_version v11.3.0
 
 orbs:
-  ci: geos-esm/circleci-tools@2
+  ci: geos-esm/circleci-tools@dev:39ea685db247f9fd0722e1bbaa50430dee83858d
 
 workflows:
   build-test:

From eb83bb1fd5068d339d5809bd4e5927198b4f050a Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 10 Jun 2024 13:37:18 -0400
Subject: [PATCH 3/4] Update CI to use BCs v11.5.0

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84620ec0..28486731 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,11 @@
 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.3.0
+#baselibs_version: &baselibs_version v7.24.0
+#bcs_version: &bcs_version v11.5.0
 
 orbs:
-  ci: geos-esm/circleci-tools@dev:39ea685db247f9fd0722e1bbaa50430dee83858d
+  ci: geos-esm/circleci-tools@2
 
 workflows:
   build-test:

From fce54f4dd7b7765656699dc3738b25fe37fa4c2b Mon Sep 17 00:00:00 2001
From: Matthew Thompson <matthew.thompson@nasa.gov>
Date: Mon, 10 Jun 2024 14:04:07 -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 28486731..eeec7610 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: