Skip to content

Sync develop into main #760

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
mathomp4 merged 22 commits into from
Aug 29, 2025
Merged

Sync develop into main #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d0b9f0f
update AGCM history template to be more in line with variable names f…
acollow Jul 2, 2025
8d37bf0
adds diagnostics for ammonia and ammonium scavenging
acollow Jul 2, 2025
5dec393
v11: Make CICE6 default
mathomp4 Jul 11, 2025
b21956c
copy ice_in if cloning a run using CICE6
zhaobin74 Jul 21, 2025
ec11e5e
Update other setup scripts
mathomp4 Jul 22, 2025
27b31e1
Update Ocean DT at runtime
mathomp4 Jul 22, 2025
17ff06d
Fix some sed typos
mathomp4 Jul 22, 2025
da899df
Fix typo in setup
mathomp4 Jul 22, 2025
5acf51b
Merge pull request #749 from GEOS-ESM/feature/acollow/agcm_aerohistory
sdrabenh Aug 25, 2025
1eb0b79
Merge branch 'develop' into feature/acollow/addNISVdiags
sdrabenh Aug 25, 2025
a90f081
Merge pull request #750 from GEOS-ESM/feature/acollow/addNISVdiags
sdrabenh Aug 25, 2025
d99d68e
Merge branch 'develop' into feature/v11-cice6-default
sdrabenh Aug 25, 2025
3574c9e
Merge pull request #752 from GEOS-ESM/feature/v11-cice6-default
sdrabenh Aug 25, 2025
b352850
Merge branch 'develop' into feature/zhaobin74/add-cice6-config-clone
sdrabenh Aug 25, 2025
aea5f86
Merge pull request #754 from GEOS-ESM/feature/zhaobin74/add-cice6-con…
sdrabenh Aug 25, 2025
682bb70
Merge branch 'develop' into feature/update-ocean-dt-runtime
sdrabenh Aug 25, 2025
faaf89e
Merge pull request #755 from GEOS-ESM/feature/update-ocean-dt-runtime
sdrabenh Aug 25, 2025
a8ed231
Update other setup scripts
mathomp4 Aug 25, 2025
393f28e
v11: Fix sed for ice_in
mathomp4 Aug 27, 2025
a06a240
Fix bug
mathomp4 Aug 28, 2025
262bfe3
Merge pull request #759 from GEOS-ESM/bugfix/fix-ice_in-sed
sdrabenh Aug 29, 2025
a7dae21
Merge branch 'main' into develop
mathomp4 Aug 29, 2025
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
2 changes: 2 additions & 0 deletions AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ CLOSURE_CONGESTUS: 3
@HIST_GOCARTCA.oc::CA.ocphilic default
@HIST_GOCARTNI::NO3an1 "NI::NO3an2,NI::NO3an3"
@HIST_GOCARTPCHEM::OX default
@HIST_GOCARTNI::NH3 default
@HIST_GOCARTNI::NH4a default
@HIST_GOCART::
@HIST_GOCART###########################################################

Expand Down
136 changes: 115 additions & 21 deletions HISTORY.AGCM.rc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ COLLECTIONS: 'geosgcm_prog'
'geosgcm_tracer'
@HIST_GOCART 'tavg2d_aer_x'
@HIST_GOCART 'tavg3d_aer_p'
#@HIST_GOCART 'inst3d_aer_v'
#@HIST_GOCART 'inst2d_hwl_x'
# 'geosgcm_iau'
# 'geosgcm_conv'
# 'goswim_catch'
Expand Down Expand Up @@ -882,10 +884,10 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'SSAERIDX' , 'SS' ,
'SSFLUXU' , 'SS' ,
'SSFLUXV' , 'SS' ,
'SUEM' , 'SU' ,
'SUDP' , 'SU' ,
'SUWT' , 'SU' ,
'SUSD' , 'SU' ,
'SUEM' , 'SU' ,'DMSEM;SO2EM;SO4EM;MSAEM',
'SUDP' , 'SU' ,'DMSDP;SO2DP;SO4DP;MSADP',
'SUWT' , 'SU' ,'DMSWT;SO2WT;SO4WT;MSAWT',
'SUSD' , 'SU' ,'DMSSD;SO2SD;SO4SD;MSASD',
'SO2SMASS' , 'SU' ,
'SO2CMASS' , 'SU' ,
'SO4SMASS' , 'SU' ,
Expand All @@ -909,27 +911,27 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'SO2EMVE' , 'SU' ,
'SUFLUXU' , 'SU' ,
'SUFLUXV' , 'SU' ,
'CA.bcEM' , 'CA.bc' , 'BCEM001;BCEM002' ,
'CA.bcDP' , 'CA.bc' , 'BCDP001;BCDP002' ,
'CA.bcWT' , 'CA.bc' , 'BCWT001;BCWT002' ,
# 'CA.bcSD' , 'CA.bc' , 'BCSD001;BCSD002' ,
'CA.bcEM' , 'CA.bc' , 'BCPHOBICEM;BCPHILICEM' ,
'CA.bcDP' , 'CA.bc' , 'BCPHOBICDP;BCPHILICDP' ,
'CA.bcWT' , 'CA.bc' , 'BCPHOBICWT;BCPHILICWT' ,
# 'CA.bcSD' , 'CA.bc' , 'BCPHOBICSD;BCPHILICSD' ,
'CA.bcSMASS' , 'CA.bc' , 'BCSMASS' ,
'CA.bcCMASS' , 'CA.bc' , 'BCCMASS' ,
'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' ,
'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' ,
'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' ,
'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' ,
'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' ,
'CA.bcHYPHIL' , 'CA.bc' , 'BCHYPHIL' ,
'CA.bcHYPHIL' , 'CA.bc' , 'BCPHOB2PHIL' ,
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' ,
'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' ,
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002' ,
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002' ,
'CA.ocWT' , 'CA.oc' , 'OCWT001;OCWT002' ,
# 'CA.ocSD' , 'CA.oc' , 'OCSD001;OCSD002' ,
'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' ,
'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' ,
'CA.ocWT' , 'CA.oc' , 'OCPHOBICWT;OCPHILICWT' ,
# 'CA.ocSD' , 'CA.oc' , 'OCPHOBICSD;OCPHILICSD' ,
'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' ,
'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' ,
'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' ,
Expand All @@ -942,13 +944,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' ,
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' ,
'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' ,
'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' ,
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
'CA.brWT' , 'CA.br' , 'BRWT001;BRWT002' ,
# 'CA.brSD' , 'CA.br' , 'BRSD001;BRSD002' ,
'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM',
'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP',
'CA.brWT' , 'CA.br' , 'BRPHOBICWT;BRPHILICWT',
# 'CA.brSD' , 'CA.br' , 'BRPHOBICSD;BRPHILICSD',
'CA.brSMASS' , 'CA.br' , 'BRSMASS' ,
'CA.brCMASS' , 'CA.br' , 'BRCMASS' ,
'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' ,
Expand All @@ -957,7 +959,7 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' ,
'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' ,
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
'CA.brHYPHIL' , 'CA.br' , 'BRHYPHIL' ,
'CA.brHYPHIL' , 'CA.br' , 'BRPHOB2PHIL' ,
'CA.brEMBB' , 'CA.br' , 'BREMBB' ,
'CA.brEMBF' , 'CA.br' , 'BREMBF' ,
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
Expand Down Expand Up @@ -993,8 +995,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
'MCHEMTRI%NI::NH3IM' , 'PHYSICS' , 'NH3SV' ,
'MCHEMTRI%NI::NH4aIM' , 'PHYSICS' , 'NH4SV' ,
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
Expand Down Expand Up @@ -1048,6 +1050,98 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'pSOA_BIOB_VOC' , 'ACHEM', 'pSOAbiob' ,
'GOCART::CO' , 'GOCART','CO' ,
::

inst3d_aer_v.format: 'CFIO' ,
inst3d_aer_v.template: '%y4%m2%d2_%h2%n2z.nc4',
inst3d_aer_v.archive: '%c/Y%y4',
inst3d_aer_v.frequency: 030000,
inst3d_aer_v.ref_time: 000000,
inst3d_aer_v.grid_label: PC@HIST_IMx@HIST_JM-DC
inst3d_aer_v.mode: 'instantaneous',
inst3d_aer_v.nbits: 12,
#inst3d_aer_v.chunksize: 120 91 1 1,
inst3d_aer_v.deflate: 1,
inst3d_aer_v.conservative: 1,
inst3d_aer_v.splitField: 1,
inst3d_aer_v.fields: 'PS' , 'DYN' , 'PS' ,
'DELP' , 'DYN' , 'delp' ,
'LWI' , 'SURFACE' , 'LWI' ,
'RH2' , 'MOIST' , 'RH' ,
'AIRDENS' , 'CHEMENV',
'T' , 'DYN',
'ZL' , 'DYN' , 'H' ,
'DU' , 'DU', 'DU001;DU002;DU003;DU004;DU005',
'SS' , 'SS', 'SS001;SS002;SS003;SS004;SS005',
'SO2' , 'SU',
'SO4' , 'SU',
'DMS' , 'SU',
'MSA' , 'SU',
'NH3' , 'NI',
'NH4a' , 'NI',
'NO3an1' , 'NI',
'NO3an2' , 'NI',
'NO3an3' , 'NI',
'CA.bcphilic', 'CA.bc', 'BCPHILIC',
'CA.bcphobic', 'CA.bc', 'BCPHOBIC',
'CA.ocphilic', 'CA.oc', 'OCPHILIC',
'CA.ocphobic', 'CA.oc', 'OCPHOBIC',
'CA.brphilic', 'CA.br', 'BRPHILIC',
'CA.brphobic', 'CA.br', 'BRPHOBIC',
'GOCART::CO' , 'GOCART','CO' ,
::

#NOTE: Before turning on this collection, ensure the output wavelengths match GOCART2G_GridComp.rc
# ------------------------------------------------------------------------------------------------
inst2d_hwl_x.format: 'CFIO',
inst2d_hwl_x.template: '%y4%m2%d2_%h2%n2z.nc4',
inst2d_hwl_x.archive: '%c/Y%y4',
inst2d_hwl_x.mode: 'instantaneous',
inst2d_hwl_x.nbits: 12,
# inst2d_hwl_x.chunksize: 120 91 1 1,
inst2d_hwl_x.deflate: 1,
inst2d_hwl_x.conservative: 1,
inst2d_hwl_x.frequency: 010000,
inst2d_hwl_x.duration: 010000,
inst2d_hwl_x.ref_time: 000000,
inst2d_hwl_x.grid_label: PC@HIST_IMx@HIST_JM-DC
inst2d_hwl_x.splitField: 1,
inst2d_hwl_x.fields: 'SLP' , 'DYN' ,
'TOTEXTTAU' , 'GOCART2G' , 'TOTEXTTAU470;TOTEXTTAU550;TOTEXTTAU870',
'TOTSCATAU' , 'GOCART2G' , 'TOTSCATAU470;TOTSCATAU550;TOTSCATAU870',
'TOTSTEXTTAU' , 'GOCART2G' , 'TOTSTEXTTAU470;TOTSTEXTTAU550;TOTSTEXTTAU870',
'TOTSTSCATAU' , 'GOCART2G' , 'TOTSTSCATAU470;TOTSTSCATAU550;TOTSTSCATAU870',
'TOTANGSTR' , 'GOCART2G' ,
'DUEXTTAU' , 'DU' , 'DUEXTTAU470;DUEXTTAU550;DUEXTTAU870',
'SSEXTTAU' , 'SS' , 'SSEXTTAU470;SSEXTTAU550;SSEXTTAU870',
'SUEXTTAU' , 'SU' , 'SUEXTTAU470;SUEXTTAU550;SUEXTTAU870',
'CA.bcEXTTAU', 'CA.bc' , 'BCEXTTAU470;BCEXTTAU550;BCEXTTAU870',
'CA.brEXTTAU', 'CA.br' , 'BREXTTAU470;BREXTTAU550;BREXTTAU870',
'CA.ocEXTTAU', 'CA.oc' , 'OCEXTTAU470;OCEXTTAU550;OCEXTTAU870',
'NIEXTTAU' , 'NI' , 'NIEXTTAU470;NIEXTTAU550;NIEXTTAU870',
'DUSMASS' , 'DU' ,
'SSSMASS' , 'SS' ,
'DUSMASS25' , 'DU' ,
'SSSMASS25' , 'SS' ,
'SO4SMASS' , 'SU' ,
'SO2SMASS' , 'SU' ,
'SO4CMASS' , 'SU' ,
'SO2CMASS' , 'SU' ,
'CA.bcSMASS' , 'CA.bc' , 'BCSMASS',
'CA.brSMASS' , 'CA.br' , 'BRSMASS',
'CA.ocSMASS' , 'CA.oc' , 'OCSMASS',
'NISMASS' , 'NI' ,
'NISMASS25' , 'NI' ,
'PM' , 'GOCART2G' ,
'PM25' , 'GOCART2G' ,
'PLS' , 'MOIST' ,
'PCU' , 'MOIST' ,
'COCL' , 'GOCART' ,
'SUPSO4AQ' , 'SU' ,
'SUPSO4G' , 'SU' ,
::




geosgcm_tracer.template: '%y4%m2%d2_%h2%n2z.nc4' ,
geosgcm_tracer.archive: '%c/Y%y4' ,
Expand Down
17 changes: 16 additions & 1 deletion gcm_run.j
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,21 @@ if( $wavewatch ) then
/bin/rm ww3_multi.nml.tmp
endif

@COUPLED# gcm_setup will make sure AGCM.rc, MOM_override and CICE6 use a Ocean DT
@COUPLED# consistent with CAP.rc HEARTBEAT_DT. But a user might change the
@COUPLED# HEARTBEAT_DT in CAP.rc at run time, so we need to update the dt in
@COUPLED# the other files

@COUPLEDset HEARTBEAT_DT = `grep '^\s*HEARTBEAT_DT:' CAP.rc | cut -d: -f2 | awk '{print $1}'`

@COUPLED sed -i -e "s/OGCM_RUN_DT: [0-9]\+\(\.[0-9]\+\)\?/OGCM_RUN_DT: $HEARTBEAT_DT/g" AGCM.rc
@MOM5 sed -i -e "s/dt_cpld = [0-9]\+\(\.[0-9]\+\)\?,/dt_cpld = $HEARTBEAT_DT,/g" \
@MOM5 -e "s/dt_atmos = [0-9]\+\(\.[0-9]\+\)\?,/dt_atmos = $HEARTBEAT_DT,/g" MOM_override
@MOM6 sed -i -e "s/DT = [0-9]\+\(\.[0-9]\+\)\?/DT = $HEARTBEAT_DT/g" \
@MOM6 -e "s/DT_THERM = [0-9]\+\(\.[0-9]\+\)\?/DT_THERM = $HEARTBEAT_DT/g" MOM_override
@CICE6 sed -i -E "s/^([[:space:]]*dt[[:space:]]*=[[:space:]]*)[0-9]+(\.[0-9]+)?/\1${HEARTBEAT_DT}/" ice_in


if( $AGCM_LM != 72 ) then
set files = `/bin/ls *.yaml`
foreach file ($files)
Expand Down Expand Up @@ -1272,7 +1287,7 @@ end
@MOM5 if(! -e $EXPDIR/MOM_Output) mkdir -p $EXPDIR/MOM_Output
@MOM5 /bin/mv $SCRDIR/$dset.nc $EXPDIR/MOM_Output/$dset.${edate}.nc
@MOM5 endif
@MOM5 end
@MOM5 end
@MOM6 foreach dset ( $dsets )
@MOM6 set num = `/bin/ls -1 $dset.nc | wc -l`
@MOM6 if($num != 0) then
Expand Down
16 changes: 14 additions & 2 deletions gcm_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,13 +724,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 @@ -2812,6 +2812,11 @@ if( $OGCM == TRUE ) then

endif

# We also need to change the dt in ice_in as well for CICE6
if ( $SEAICE_NAME == "CICE6" ) then
sed -i -E "s/^([[:space:]]*dt[[:space:]]*=[[:space:]]*)[0-9]+(\.[0-9]+)?/\1${OCEAN_DT}/" "$HOMDIR/ice_in"
endif

endif

#######################################################################
Expand Down Expand Up @@ -2999,6 +3004,7 @@ if ( $OGCM == 1 ) then
# Now we need to find out if we are running MOM or MOM6 by looking
# at OCEAN_NAME: val and checking if it is MOM or MOM6
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
else if ( $OGCM == 0 ) then
set OGCM = FALSE
else
Expand Down Expand Up @@ -3092,6 +3098,12 @@ HOMDIR/data_table
EOF
endif

if ( "$SEAICEMODEL" == "CICE6" ) then
cat >> $FILES_TO_PROCESS << EOF
HOMDIR/ice_in
EOF
endif

endif

cat >> $FILES_TO_PROCESS << EOF
Expand Down
16 changes: 14 additions & 2 deletions geoschemchem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,13 +724,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 @@ -3008,6 +3008,11 @@ if( $OGCM == TRUE ) then

endif

# We also need to change the dt in ice_in as well for CICE6
if ( $SEAICE_NAME == "CICE6" ) then
sed -i -E "s/^([[:space:]]*dt[[:space:]]*=[[:space:]]*)[0-9]+(\.[0-9]+)?/\1${OCEAN_DT}/" "$HOMDIR/ice_in"
endif

endif

#######################################################################
Expand Down Expand Up @@ -3212,6 +3217,7 @@ if ( $OGCM == 1 ) then
# Now we need to find out if we are running MOM or MOM6 by looking
# at OCEAN_NAME: val and checking if it is MOM or MOM6
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
else if ( $OGCM == 0 ) then
set OGCM = FALSE
else
Expand Down Expand Up @@ -3305,6 +3311,12 @@ HOMDIR/data_table
EOF
endif

if ( "$SEAICEMODEL" == "CICE6" ) then
cat >> $FILES_TO_PROCESS << EOF
HOMDIR/ice_in
EOF
endif

endif

cat >> $FILES_TO_PROCESS << EOF
Expand Down
16 changes: 14 additions & 2 deletions gmichem_setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,13 +729,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 @@ -3240,6 +3240,11 @@ if( $OGCM == TRUE ) then

endif

# We also need to change the dt in ice_in as well for CICE6
if ( $SEAICE_NAME == "CICE6" ) then
sed -i -E "s/^([[:space:]]*dt[[:space:]]*=[[:space:]]*)[0-9]+(\.[0-9]+)?/\1${OCEAN_DT}/" "$HOMDIR/ice_in"
endif

endif

#######################################################################
Expand Down Expand Up @@ -3427,6 +3432,7 @@ if ( $OGCM == 1 ) then
# Now we need to find out if we are running MOM or MOM6 by looking
# at OCEAN_NAME: val and checking if it is MOM or MOM6
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
else if ( $OGCM == 0 ) then
set OGCM = FALSE
else
Expand Down Expand Up @@ -3520,6 +3526,12 @@ HOMDIR/data_table
EOF
endif

if ( "$SEAICEMODEL" == "CICE6" ) then
cat >> $FILES_TO_PROCESS << EOF
HOMDIR/ice_in
EOF
endif

endif

cat >> $FILES_TO_PROCESS << EOF
Expand Down
Loading