diff --git a/AGCM.rc.tmpl b/AGCM.rc.tmpl index 9ff59044..deeb164a 100644 --- a/AGCM.rc.tmpl +++ b/AGCM.rc.tmpl @@ -529,7 +529,6 @@ RECORD_REF_TIME: >>>REFTIME<<< >>>FCSTIME<<< # Choice for Land Surface Model # 1 : Catchment # 2 : CatchmentCNCLM40 -# 3 : CatchmentCNCLM45 # ------------------------------------------------------------ LSM_CHOICE: @LSM_CHOICE diff --git a/gcm_setup b/gcm_setup index bfc294e5..584ff280 100755 --- a/gcm_setup +++ b/gcm_setup @@ -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 diff --git a/geoschemchem_setup b/geoschemchem_setup index 51f4f95e..cae180ba 100755 --- a/geoschemchem_setup +++ b/geoschemchem_setup @@ -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 diff --git a/gmichem_setup b/gmichem_setup index 8a03a4aa..305b6e76 100755 --- a/gmichem_setup +++ b/gmichem_setup @@ -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 diff --git a/stratchem_setup b/stratchem_setup index 4d62b177..788b3420 100755 --- a/stratchem_setup +++ b/stratchem_setup @@ -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