Skip to content

Commit

Permalink
Merge pull request #616 from GEOS-ESM/feature/borescan_v12_bcs
Browse files Browse the repository at this point in the history 
Moving to v12 BCS
  • Loading branch information
@sdrabenh
sdrabenh committed Jun 10, 2024
2 parents 3d38005 + fce54f4 commit 8264a28
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Original file line number Diff line number Diff line change
@@ -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.3.0
#baselibs_version: &baselibs_version v7.23.0
#bcs_version: &bcs_version v11.5.0

orbs:
ci: geos-esm/circleci-tools@2
Expand Down
8 changes: 4 additions & 4 deletions gcm_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1430,16 +1430,16 @@ 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"
set EMIP_NEWLAND = ""
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

Expand Down
8 changes: 4 additions & 4 deletions geoschemchem_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1445,16 +1445,16 @@ 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"
set EMIP_NEWLAND = ""
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

Expand Down
8 changes: 4 additions & 4 deletions gmichem_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1542,16 +1542,16 @@ 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"
set EMIP_NEWLAND = ""
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

Expand Down
8 changes: 4 additions & 4 deletions stratchem_setup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1445,16 +1445,16 @@ 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"
set EMIP_NEWLAND = ""
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

Expand Down

0 comments on commit 8264a28

Please sign in to comment.