Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Moving to v12 BCS #616

Merged
merged 5 commits into from
Jun 10, 2024
Merged

Moving to v12 BCS #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fbabe52
moving to v12, same as v11 with bug fix
biljanaorescanin Jun 7, 2024
1b5f474
Merge branch 'develop' into feature/borescan_v12_bcs
sdrabenh Jun 10, 2024
3260fe8
Test CI Fix
mathomp4 Jun 10, 2024
eb83bb1
Update CI to use BCs v11.5.0
mathomp4 Jun 10, 2024
fce54f4
Use 7.23.0
mathomp4 Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading