Skip to content

v12: Fix DataAtm Bug, make CICE6 default #735

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

Merged
sdrabenh merged 1 commit into from
Jun 4, 2025
Merged

v12: Fix DataAtm Bug, make CICE6 default #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions gcm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,13 +694,13 @@ if( $OGCM == TRUE ) then
# Seaice Model
# -----------
SEAICEMODEL:
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE4${CN})"
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE6${CN})"
echo " ${C2}CICE4${CN}"
echo " ${C2}CICE6${CN}"

set SEAICEMODEL = $<
if ( .$SEAICEMODEL == . ) then
set SEAICEMODEL = "CICE4"
set SEAICEMODEL = "CICE6"
else
set SEAICEMODEL = `echo $SEAICEMODEL | tr "[:lower:]" "[:upper:]"`

Expand Down Expand Up @@ -1436,6 +1436,7 @@ if ($DATA_ATMOS == TRUE) then
set EMIP_MERRA2 = "MERRA2_NewLand"
set HIST_CATCHCN = "#DELETE"
set GCMRUN_CATCHCN = "#DELETE"
set GWD_IN_BCS = "FALSE"
else

echo "Enter the choice of ${C1}Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Icarus-NLv3), or ${C2}v13${CN} (Default)"
Expand Down
5 changes: 3 additions & 2 deletions geoschemchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,13 +694,13 @@ if( $OGCM == TRUE ) then
# Seaice Model
# -----------
SEAICEMODEL:
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE4${CN})"
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE6${CN})"
echo " ${C2}CICE4${CN}"
echo " ${C2}CICE6${CN}"

set SEAICEMODEL = $<
if ( .$SEAICEMODEL == . ) then
set SEAICEMODEL = "CICE4"
set SEAICEMODEL = "CICE6"
else
set SEAICEMODEL = `echo $SEAICEMODEL | tr "[:lower:]" "[:upper:]"`

Expand Down Expand Up @@ -1452,6 +1452,7 @@ if ($DATA_ATMOS == TRUE) then
set EMIP_MERRA2 = "MERRA2_NewLand"
set HIST_CATCHCN = "#DELETE"
set GCMRUN_CATCHCN = "#DELETE"
set GWD_IN_BCS = "FALSE"
else

echo "Enter the choice of ${C1}Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Icarus-NLv3), or ${C2}v13${CN} (Default)"
Expand Down
5 changes: 3 additions & 2 deletions gmichem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,13 +694,13 @@ if( $OGCM == TRUE ) then
# Seaice Model
# -----------
SEAICEMODEL:
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE4${CN})"
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE6${CN})"
echo " ${C2}CICE4${CN}"
echo " ${C2}CICE6${CN}"

set SEAICEMODEL = $<
if ( .$SEAICEMODEL == . ) then
set SEAICEMODEL = "CICE4"
set SEAICEMODEL = "CICE6"
else
set SEAICEMODEL = `echo $SEAICEMODEL | tr "[:lower:]" "[:upper:]"`

Expand Down Expand Up @@ -1542,6 +1542,7 @@ if ($DATA_ATMOS == TRUE) then
set EMIP_MERRA2 = "MERRA2_NewLand"
set HIST_CATCHCN = "#DELETE"
set GCMRUN_CATCHCN = "#DELETE"
set GWD_IN_BCS = "FALSE"
else

echo "Enter the choice of ${C1}Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Icarus-NLv3), or ${C2}v13${CN} (Default)"
Expand Down
5 changes: 3 additions & 2 deletions stratchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,13 +694,13 @@ if( $OGCM == TRUE ) then
# Seaice Model
# -----------
SEAICEMODEL:
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE4${CN})"
echo "Choose a ${C1}Seaice Model${CN}: (Default: ${C2}CICE6${CN})"
echo " ${C2}CICE4${CN}"
echo " ${C2}CICE6${CN}"

set SEAICEMODEL = $<
if ( .$SEAICEMODEL == . ) then
set SEAICEMODEL = "CICE4"
set SEAICEMODEL = "CICE6"
else
set SEAICEMODEL = `echo $SEAICEMODEL | tr "[:lower:]" "[:upper:]"`

Expand Down Expand Up @@ -1453,6 +1453,7 @@ if ($DATA_ATMOS == TRUE) then
set EMIP_MERRA2 = "MERRA2_NewLand"
set HIST_CATCHCN = "#DELETE"
set GCMRUN_CATCHCN = "#DELETE"
set GWD_IN_BCS = "FALSE"
else

echo "Enter the choice of ${C1}Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Icarus-NLv3), or ${C2}v13${CN} (Default)"
Expand Down