Skip to content

Commit c240bb0

Browse files
sdrabenhsdrabenh
committed
Merge remote-tracking branch 'origin/develop' into feature/sdrabenh/gcm_v12
2 parents c550314 + a8ed231 commit c240bb0

File tree

7 files changed

+179
-21
lines changed

7 files changed

+179
-21
lines changed

‎AGCM.rc.tmpl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ NCAR_NRDG: @NCAR_NRDG
142142
@HIST_GOCARTCA.oc::CA.ocphilic default
143143
@HIST_GOCARTNI::NO3an1 "NI::NO3an2,NI::NO3an3"
144144
@HIST_GOCARTPCHEM::OX default
145+
@HIST_GOCARTNI::NH3 default
146+
@HIST_GOCARTNI::NH4a default
145147
@HIST_GOCART::
146148
# 3D moist scavenging increments
147149
@HIST_GOCARTMTRI_increments::

‎HISTORY.AGCM.rc.tmpl‎

Lines changed: 115 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ COLLECTIONS: 'geosgcm_prog'
2222
'geosgcm_tracer'
2323
@HIST_GOCART 'tavg2d_aer_x'
2424
@HIST_GOCART 'tavg3d_aer_p'
25+
#@HIST_GOCART 'inst3d_aer_v'
26+
#@HIST_GOCART 'inst2d_hwl_x'
2527
# 'geosgcm_iau'
2628
# 'geosgcm_conv'
2729
# 'goswim_catch'
@@ -898,10 +900,10 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
898900
'SSAERIDX' , 'SS' ,
899901
'SSFLUXU' , 'SS' ,
900902
'SSFLUXV' , 'SS' ,
901-
'SUEM' , 'SU' ,
902-
'SUDP' , 'SU' ,
903-
'SUWT' , 'SU' ,
904-
'SUSD' , 'SU' ,
903+
'SUEM' , 'SU' ,'DMSEM;SO2EM;SO4EM;MSAEM',
904+
'SUDP' , 'SU' ,'DMSDP;SO2DP;SO4DP;MSADP',
905+
'SUWT' , 'SU' ,'DMSWT;SO2WT;SO4WT;MSAWT',
906+
'SUSD' , 'SU' ,'DMSSD;SO2SD;SO4SD;MSASD',
905907
'SO2SMASS' , 'SU' ,
906908
'SO2CMASS' , 'SU' ,
907909
'SO4SMASS' , 'SU' ,
@@ -925,27 +927,27 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
925927
'SO2EMVE' , 'SU' ,
926928
'SUFLUXU' , 'SU' ,
927929
'SUFLUXV' , 'SU' ,
928-
'CA.bcEM' , 'CA.bc' , 'BCEM001;BCEM002' ,
929-
'CA.bcDP' , 'CA.bc' , 'BCDP001;BCDP002' ,
930-
'CA.bcWT' , 'CA.bc' , 'BCWT001;BCWT002' ,
931-
# 'CA.bcSD' , 'CA.bc' , 'BCSD001;BCSD002' ,
930+
'CA.bcEM' , 'CA.bc' , 'BCPHOBICEM;BCPHILICEM' ,
931+
'CA.bcDP' , 'CA.bc' , 'BCPHOBICDP;BCPHILICDP' ,
932+
'CA.bcWT' , 'CA.bc' , 'BCPHOBICWT;BCPHILICWT' ,
933+
# 'CA.bcSD' , 'CA.bc' , 'BCPHOBICSD;BCPHILICSD' ,
932934
'CA.bcSMASS' , 'CA.bc' , 'BCSMASS' ,
933935
'CA.bcCMASS' , 'CA.bc' , 'BCCMASS' ,
934936
'CA.bcEXTTAU' , 'CA.bc' , 'BCEXTTAU' ,
935937
'CA.bcSCATAU' , 'CA.bc' , 'BCSCATAU' ,
936938
'CA.bcSTEXTTAU' , 'CA.bc' , 'BCSTEXTTAU' ,
937939
'CA.bcSTSCATAU' , 'CA.bc' , 'BCSTSCATAU' ,
938940
'CA.bcANGSTR' , 'CA.bc' , 'BCANGSTR' ,
939-
'CA.bcHYPHIL' , 'CA.bc' , 'BCHYPHIL' ,
941+
'CA.bcHYPHIL' , 'CA.bc' , 'BCPHOB2PHIL' ,
940942
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
941943
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
942944
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
943945
'CA.bcFLUXU' , 'CA.bc' , 'BCFLUXU' ,
944946
'CA.bcFLUXV' , 'CA.bc' , 'BCFLUXV' ,
945-
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002' ,
946-
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002' ,
947-
'CA.ocWT' , 'CA.oc' , 'OCWT001;OCWT002' ,
948-
# 'CA.ocSD' , 'CA.oc' , 'OCSD001;OCSD002' ,
947+
'CA.ocEM' , 'CA.oc' , 'OCPHOBICEM;OCPHILICEM' ,
948+
'CA.ocDP' , 'CA.oc' , 'OCPHOBICDP;OCPHILICDP' ,
949+
'CA.ocWT' , 'CA.oc' , 'OCPHOBICWT;OCPHILICWT' ,
950+
# 'CA.ocSD' , 'CA.oc' , 'OCPHOBICSD;OCPHILICSD' ,
949951
'CA.ocSMASS' , 'CA.oc' , 'OCSMASS' ,
950952
'CA.ocCMASS' , 'CA.oc' , 'OCCMASS' ,
951953
'CA.ocEXTTAU' , 'CA.oc' , 'OCEXTTAU' ,
@@ -958,13 +960,13 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
958960
'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' ,
959961
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
960962
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
961-
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
963+
'CA.ocHYPHIL' , 'CA.oc' , 'OCPHOB2PHIL' ,
962964
'CA.ocFLUXU' , 'CA.oc' , 'OCFLUXU' ,
963965
'CA.ocFLUXV' , 'CA.oc' , 'OCFLUXV' ,
964-
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
965-
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
966-
'CA.brWT' , 'CA.br' , 'BRWT001;BRWT002' ,
967-
# 'CA.brSD' , 'CA.br' , 'BRSD001;BRSD002' ,
966+
'CA.brEM' , 'CA.br' , 'BRPHOBICEM;BRPHILICEM',
967+
'CA.brDP' , 'CA.br' , 'BRPHOBICDP;BRPHILICDP',
968+
'CA.brWT' , 'CA.br' , 'BRPHOBICWT;BRPHILICWT',
969+
# 'CA.brSD' , 'CA.br' , 'BRPHOBICSD;BRPHILICSD',
968970
'CA.brSMASS' , 'CA.br' , 'BRSMASS' ,
969971
'CA.brCMASS' , 'CA.br' , 'BRCMASS' ,
970972
'CA.brEXTTAU' , 'CA.br' , 'BREXTTAU' ,
@@ -973,7 +975,7 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
973975
'CA.brSTSCATAU' , 'CA.br' , 'BRSTSCATAU' ,
974976
'CA.brANGSTR' , 'CA.br' , 'BRANGSTR' ,
975977
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
976-
'CA.brHYPHIL' , 'CA.br' , 'BRHYPHIL' ,
978+
'CA.brHYPHIL' , 'CA.br' , 'BRPHOB2PHIL' ,
977979
'CA.brEMBB' , 'CA.br' , 'BREMBB' ,
978980
'CA.brEMBF' , 'CA.br' , 'BREMBF' ,
979981
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
@@ -1009,8 +1011,8 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
10091011
'NH4WT' , 'NI' ,
10101012
'NIFLUXU' , 'NI' ,
10111013
'NIFLUXV' , 'NI' ,
1012-
'NH3SV' , 'NI' ,
1013-
'NH4SV' , 'NI' ,
1014+
'MCHEMTRI%NI::NH3IM' , 'PHYSICS' , 'NH3SV' ,
1015+
'MCHEMTRI%NI::NH4aIM' , 'PHYSICS' , 'NH4SV' ,
10141016
'MCHEMTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
10151017
'MCHEMTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
10161018
'MCHEMTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
@@ -1064,6 +1066,98 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
10641066
'pSOA_BIOB_VOC' , 'ACHEM', 'pSOAbiob' ,
10651067
'GOCART::CO' , 'GOCART','CO' ,
10661068
::
1069+
1070+
inst3d_aer_v.format: 'CFIO' ,
1071+
inst3d_aer_v.template: '%y4%m2%d2_%h2%n2z.nc4',
1072+
inst3d_aer_v.archive: '%c/Y%y4',
1073+
inst3d_aer_v.frequency: 030000,
1074+
inst3d_aer_v.ref_time: 000000,
1075+
inst3d_aer_v.grid_label: PC@HIST_IMx@HIST_JM-DC
1076+
inst3d_aer_v.mode: 'instantaneous',
1077+
inst3d_aer_v.nbits: 12,
1078+
#inst3d_aer_v.chunksize: 120 91 1 1,
1079+
inst3d_aer_v.deflate: 1,
1080+
inst3d_aer_v.conservative: 1,
1081+
inst3d_aer_v.splitField: 1,
1082+
inst3d_aer_v.fields: 'PS' , 'DYN' , 'PS' ,
1083+
'DELP' , 'DYN' , 'delp' ,
1084+
'LWI' , 'SURFACE' , 'LWI' ,
1085+
'RH2' , 'MOIST' , 'RH' ,
1086+
'AIRDENS' , 'CHEMENV',
1087+
'T' , 'DYN',
1088+
'ZL' , 'DYN' , 'H' ,
1089+
'DU' , 'DU', 'DU001;DU002;DU003;DU004;DU005',
1090+
'SS' , 'SS', 'SS001;SS002;SS003;SS004;SS005',
1091+
'SO2' , 'SU',
1092+
'SO4' , 'SU',
1093+
'DMS' , 'SU',
1094+
'MSA' , 'SU',
1095+
'NH3' , 'NI',
1096+
'NH4a' , 'NI',
1097+
'NO3an1' , 'NI',
1098+
'NO3an2' , 'NI',
1099+
'NO3an3' , 'NI',
1100+
'CA.bcphilic', 'CA.bc', 'BCPHILIC',
1101+
'CA.bcphobic', 'CA.bc', 'BCPHOBIC',
1102+
'CA.ocphilic', 'CA.oc', 'OCPHILIC',
1103+
'CA.ocphobic', 'CA.oc', 'OCPHOBIC',
1104+
'CA.brphilic', 'CA.br', 'BRPHILIC',
1105+
'CA.brphobic', 'CA.br', 'BRPHOBIC',
1106+
'GOCART::CO' , 'GOCART','CO' ,
1107+
::
1108+
1109+
#NOTE: Before turning on this collection, ensure the output wavelengths match GOCART2G_GridComp.rc
1110+
# ------------------------------------------------------------------------------------------------
1111+
inst2d_hwl_x.format: 'CFIO',
1112+
inst2d_hwl_x.template: '%y4%m2%d2_%h2%n2z.nc4',
1113+
inst2d_hwl_x.archive: '%c/Y%y4',
1114+
inst2d_hwl_x.mode: 'instantaneous',
1115+
inst2d_hwl_x.nbits: 12,
1116+
# inst2d_hwl_x.chunksize: 120 91 1 1,
1117+
inst2d_hwl_x.deflate: 1,
1118+
inst2d_hwl_x.conservative: 1,
1119+
inst2d_hwl_x.frequency: 010000,
1120+
inst2d_hwl_x.duration: 010000,
1121+
inst2d_hwl_x.ref_time: 000000,
1122+
inst2d_hwl_x.grid_label: PC@HIST_IMx@HIST_JM-DC
1123+
inst2d_hwl_x.splitField: 1,
1124+
inst2d_hwl_x.fields: 'SLP' , 'DYN' ,
1125+
'TOTEXTTAU' , 'GOCART2G' , 'TOTEXTTAU470;TOTEXTTAU550;TOTEXTTAU870',
1126+
'TOTSCATAU' , 'GOCART2G' , 'TOTSCATAU470;TOTSCATAU550;TOTSCATAU870',
1127+
'TOTSTEXTTAU' , 'GOCART2G' , 'TOTSTEXTTAU470;TOTSTEXTTAU550;TOTSTEXTTAU870',
1128+
'TOTSTSCATAU' , 'GOCART2G' , 'TOTSTSCATAU470;TOTSTSCATAU550;TOTSTSCATAU870',
1129+
'TOTANGSTR' , 'GOCART2G' ,
1130+
'DUEXTTAU' , 'DU' , 'DUEXTTAU470;DUEXTTAU550;DUEXTTAU870',
1131+
'SSEXTTAU' , 'SS' , 'SSEXTTAU470;SSEXTTAU550;SSEXTTAU870',
1132+
'SUEXTTAU' , 'SU' , 'SUEXTTAU470;SUEXTTAU550;SUEXTTAU870',
1133+
'CA.bcEXTTAU', 'CA.bc' , 'BCEXTTAU470;BCEXTTAU550;BCEXTTAU870',
1134+
'CA.brEXTTAU', 'CA.br' , 'BREXTTAU470;BREXTTAU550;BREXTTAU870',
1135+
'CA.ocEXTTAU', 'CA.oc' , 'OCEXTTAU470;OCEXTTAU550;OCEXTTAU870',
1136+
'NIEXTTAU' , 'NI' , 'NIEXTTAU470;NIEXTTAU550;NIEXTTAU870',
1137+
'DUSMASS' , 'DU' ,
1138+
'SSSMASS' , 'SS' ,
1139+
'DUSMASS25' , 'DU' ,
1140+
'SSSMASS25' , 'SS' ,
1141+
'SO4SMASS' , 'SU' ,
1142+
'SO2SMASS' , 'SU' ,
1143+
'SO4CMASS' , 'SU' ,
1144+
'SO2CMASS' , 'SU' ,
1145+
'CA.bcSMASS' , 'CA.bc' , 'BCSMASS',
1146+
'CA.brSMASS' , 'CA.br' , 'BRSMASS',
1147+
'CA.ocSMASS' , 'CA.oc' , 'OCSMASS',
1148+
'NISMASS' , 'NI' ,
1149+
'NISMASS25' , 'NI' ,
1150+
'PM' , 'GOCART2G' ,
1151+
'PM25' , 'GOCART2G' ,
1152+
'PLS' , 'MOIST' ,
1153+
'PCU' , 'MOIST' ,
1154+
'COCL' , 'GOCART' ,
1155+
'SUPSO4AQ' , 'SU' ,
1156+
'SUPSO4G' , 'SU' ,
1157+
::
1158+
1159+
1160+
10671161

10681162
geosgcm_tracer.template: '%y4%m2%d2_%h2%n2z.nc4' ,
10691163
geosgcm_tracer.archive: '%c/Y%y4' ,

‎gcm_run.j‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,20 @@ if( $wavewatch ) then
796796
/bin/rm ww3_multi.nml.tmp
797797
endif
798798
799+
@COUPLED# gcm_setup will make sure AGCM.rc, MOM_override and CICE6 use a Ocean DT
800+
@COUPLED# consistent with CAP.rc HEARTBEAT_DT. But a user might change the
801+
@COUPLED# HEARTBEAT_DT in CAP.rc at run time, so we need to update the dt in
802+
@COUPLED# the other files
803+
804+
@COUPLEDset HEARTBEAT_DT = `grep '^\s*HEARTBEAT_DT:' CAP.rc | cut -d: -f2 | awk '{print $1}'`
805+
806+
@COUPLED sed -i -e "s/OGCM_RUN_DT: [0-9]\+\(\.[0-9]\+\)\?/OGCM_RUN_DT: $HEARTBEAT_DT/g" AGCM.rc
807+
@MOM5 sed -i -e "s/dt_cpld = [0-9]\+\(\.[0-9]\+\)\?,/dt_cpld = $HEARTBEAT_DT,/g" \
808+
@MOM5 -e "s/dt_atmos = [0-9]\+\(\.[0-9]\+\)\?,/dt_atmos = $HEARTBEAT_DT,/g" MOM_override
809+
@MOM6 sed -i -e "s/DT = [0-9]\+\(\.[0-9]\+\)\?/DT = $HEARTBEAT_DT/g" \
810+
@MOM6 -e "s/DT_THERM = [0-9]\+\(\.[0-9]\+\)\?/DT_THERM = $HEARTBEAT_DT/g" MOM_override
811+
@CICE6 sed -i -e "s/\([[:space:]]*dt[[:space:]]*=[[:space:]]*\)[0-9]*\(\.[0-9]*\)\?/\1${HEARTBEAT_DT}/g" ice_in
812+
799813
if( $AGCM_LM != 72 ) then
800814
set files = `/bin/ls *.yaml`
801815
foreach file ($files)

‎gcm_setup‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2818,6 +2818,11 @@ if( $OGCM == TRUE ) then
28182818

28192819
endif
28202820

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

28232828
#######################################################################
@@ -3005,6 +3010,7 @@ if ( $OGCM == 1 ) then
30053010
# Now we need to find out if we are running MOM or MOM6 by looking
30063011
# at OCEAN_NAME: val and checking if it is MOM or MOM6
30073012
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
3013+
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
30083014
else if ( $OGCM == 0 ) then
30093015
set OGCM = FALSE
30103016
else
@@ -3098,6 +3104,12 @@ HOMDIR/data_table
30983104
EOF
30993105
endif
31003106

3107+
if ( "$SEAICEMODEL" == "CICE6" ) then
3108+
cat >> $FILES_TO_PROCESS << EOF
3109+
HOMDIR/ice_in
3110+
EOF
3111+
endif
3112+
31013113
endif
31023114

31033115
cat >> $FILES_TO_PROCESS << EOF

‎geoschemchem_setup‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3012,6 +3012,11 @@ if( $OGCM == TRUE ) then
30123012

30133013
endif
30143014

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

30173022
#######################################################################
@@ -3216,6 +3221,7 @@ if ( $OGCM == 1 ) then
32163221
# Now we need to find out if we are running MOM or MOM6 by looking
32173222
# at OCEAN_NAME: val and checking if it is MOM or MOM6
32183223
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
3224+
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
32193225
else if ( $OGCM == 0 ) then
32203226
set OGCM = FALSE
32213227
else
@@ -3309,6 +3315,12 @@ HOMDIR/data_table
33093315
EOF
33103316
endif
33113317

3318+
if ( "$SEAICEMODEL" == "CICE6" ) then
3319+
cat >> $FILES_TO_PROCESS << EOF
3320+
HOMDIR/ice_in
3321+
EOF
3322+
endif
3323+
33123324
endif
33133325

33143326
cat >> $FILES_TO_PROCESS << EOF

‎gmichem_setup‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3237,6 +3237,11 @@ if( $OGCM == TRUE ) then
32373237

32383238
endif
32393239

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

32423247
#######################################################################
@@ -3424,6 +3429,7 @@ if ( $OGCM == 1 ) then
34243429
# Now we need to find out if we are running MOM or MOM6 by looking
34253430
# at OCEAN_NAME: val and checking if it is MOM or MOM6
34263431
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
3432+
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
34273433
else if ( $OGCM == 0 ) then
34283434
set OGCM = FALSE
34293435
else
@@ -3517,6 +3523,12 @@ HOMDIR/data_table
35173523
EOF
35183524
endif
35193525

3526+
if ( "$SEAICEMODEL" == "CICE6" ) then
3527+
cat >> $FILES_TO_PROCESS << EOF
3528+
HOMDIR/ice_in
3529+
EOF
3530+
endif
3531+
35203532
endif
35213533

35223534
cat >> $FILES_TO_PROCESS << EOF

‎stratchem_setup‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2943,6 +2943,11 @@ if( $OGCM == TRUE ) then
29432943

29442944
endif
29452945

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

29482953
#######################################################################
@@ -3134,6 +3139,7 @@ if ( $OGCM == 1 ) then
31343139
# Now we need to find out if we are running MOM or MOM6 by looking
31353140
# at OCEAN_NAME: val and checking if it is MOM or MOM6
31363141
set OCNMODEL = `grep "OCEAN_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
3142+
set SEAICEMODEL = `grep "SEAICE_NAME" ${OLDHOMDIR}/AGCM.rc | cut -d: -f2 | tr -d ' '`
31373143
else if ( $OGCM == 0 ) then
31383144
set OGCM = FALSE
31393145
else
@@ -3227,6 +3233,12 @@ HOMDIR/data_table
32273233
EOF
32283234
endif
32293235

3236+
if ( "$SEAICEMODEL" == "CICE6" ) then
3237+
cat >> $FILES_TO_PROCESS << EOF
3238+
HOMDIR/ice_in
3239+
EOF
3240+
endif
3241+
32303242
endif
32313243

32323244
cat >> $FILES_TO_PROCESS << EOF

0 commit comments

Comments
 (0)