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

Disable Catchment-CN4.5 land model option (LSM_CHOICE=3) for GCM simulations #575

Merged
merged 3 commits into from
Feb 21, 2024
Merged

Disable Catchment-CN4.5 land model option (LSM_CHOICE=3) for GCM simulations #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
938f90c
remove Catchment-CN4.5 land model option from setup scripts
gmao-jkolassa Feb 14, 2024
76707fb
correcting typo in error message for land model choice
gmao-jkolassa Feb 14, 2024
4046b15
Merge branch 'develop' into feature/jkolassa_disable_cn45
sdrabenh Feb 21, 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
1 change: 0 additions & 1 deletion AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<<
# Choice for Land Surface Model
# 1 : Catchment
# 2 : CatchmentCNCLM40
# 3 : CatchmentCNCLM45
# ------------------------------------------------------------
LSM_CHOICE: @LSM_CHOICE

Expand Down
10 changes: 3 additions & 7 deletions gcm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1519,26 +1519,22 @@ endif
# ----------------------
if( $LSM_BCS == "Icarus-NLv3" ) then
LSM_CHOICE:
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment), ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40)), ${C2}3${CN} (CatchmentCN-CLM4.5 (CN_CLM45))"
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment) or ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40))"
set LSM_CHOICE = $<
if( .$LSM_CHOICE == . ) set LSM_CHOICE = 1
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 & $LSM_CHOICE != 3 ) then
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 ) then
echo
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1{CN} , ${C2}2${CN} or ${C2}3${CN}!"
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1${CN} or ${C2}2${CN}!"
goto LSM_CHOICE
else
echo
endif
if( $LSM_CHOICE == 1 ) set HIST_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 1 ) set GCMRUN_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 2 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM40 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
else if ( $LSM_CHOICE == 3 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM45 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
endif
else
set LSM_CHOICE = 1
Expand Down
10 changes: 3 additions & 7 deletions geoschemchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,26 +1534,22 @@ endif
# ----------------------
if( $LSM_BCS == "Icarus-NLv3" ) then
LSM_CHOICE:
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment), ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40)), ${C2}3${CN} (CatchmentCN-CLM4.5 (CN_CLM45))"
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment), ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40))"
set LSM_CHOICE = $<
if( .$LSM_CHOICE == . ) set LSM_CHOICE = 1
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 & $LSM_CHOICE != 3 ) then
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 ) then
echo
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1{CN} , ${C2}2${CN} or ${C2}3${CN}!"
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1${CN} or ${C2}2${CN}!"
goto LSM_CHOICE
else
echo
endif
if( $LSM_CHOICE == 1 ) set HIST_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 1 ) set GCMRUN_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 2 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM40 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
else if ( $LSM_CHOICE == 3 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM45 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
endif
else
set LSM_CHOICE = 1
Expand Down
10 changes: 3 additions & 7 deletions gmichem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,26 +1631,22 @@ endif
# ----------------------
if( $LSM_BCS == "Icarus-NLv3" ) then
LSM_CHOICE:
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment), ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40)), ${C2}3${CN} (CatchmentCN-CLM4.5 (CN_CLM45))"
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment) or ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40))"
set LSM_CHOICE = $<
if( .$LSM_CHOICE == . ) set LSM_CHOICE = 1
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 & $LSM_CHOICE != 3 ) then
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2) then
echo
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1{CN} , ${C2}2${CN} or ${C2}3${CN}!"
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1${CN} or ${C2}2${CN}!"
goto LSM_CHOICE
else
echo
endif
if( $LSM_CHOICE == 1 ) set HIST_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 1 ) set GCMRUN_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 2 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM40 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
else if ( $LSM_CHOICE == 3 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM45 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
endif
else
set LSM_CHOICE = 1
Expand Down
10 changes: 3 additions & 7 deletions stratchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1534,26 +1534,22 @@ endif
# ----------------------
if( $LSM_BCS == "Icarus-NLv3" ) then
LSM_CHOICE:
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment), ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40)), ${C2}3${CN} (CatchmentCN-CLM4.5 (CN_CLM45))"
echo "Enter the choice of ${C1} Land Surface Model${CN} using: ${C2}1${CN} (Default: Catchment) or ${C2}2${CN} (CatchmentCN-CLM4.0 (CN_CLM40))"
set LSM_CHOICE = $<
if( .$LSM_CHOICE == . ) set LSM_CHOICE = 1
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 & $LSM_CHOICE != 3 ) then
if( $LSM_CHOICE != 1 & $LSM_CHOICE != 2 ) then
echo
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1{CN} , ${C2}2${CN} or ${C2}3${CN}!"
echo "${C1} Catchment Model${CN} must be set equal to ${C2}1${CN} or ${C2}2${CN}!"
goto LSM_CHOICE
else
echo
endif
if( $LSM_CHOICE == 1 ) set HIST_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set HIST_CATCHCN = ""
if( $LSM_CHOICE == 1 ) set GCMRUN_CATCHCN = "#DELETE"
if( $LSM_CHOICE == 2 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 3 ) set GCMRUN_CATCHCN = ""
if( $LSM_CHOICE == 2 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM40 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
else if ( $LSM_CHOICE == 3 ) then
echo "IMPORTANT: please set LAND_PARAMS: to CN_CLM45 in RC/GEOS_SurfaceGridComp.rc in the experiment directory."
endif
else
set LSM_CHOICE = 1
Expand Down
Loading