Skip to content

Commit 7f3c5cb

Browse files
authored
Merge pull request #1321 from cacraigucar/cam_alpha06g
cam6_4_096: Update externals to match cesm3_0_beta06/alpha06g
2 parents 5302ed4 + 9f67b7e commit 7f3c5cb

6 files changed

Lines changed: 233 additions & 130 deletions

File tree

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
186186
[submodule "cice"]
187187
path = components/cice
188188
url = https://github.com/ESCOMP/CESM_CICE
189-
fxtag = cesm3_cice6_6_0_6
189+
fxtag = cesm3_cice6_6_0_13
190190
fxrequired = ToplevelRequired
191191
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
192192

@@ -200,14 +200,14 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
200200
[submodule "fms"]
201201
path = libraries/FMS
202202
url = https://github.com/ESCOMP/FMS_interface
203-
fxtag = fi_250411
203+
fxtag = fi_250428
204204
fxrequired = ToplevelRequired
205205
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
206206

207207
[submodule "tools/CUPiD"]
208208
path = tools/CUPiD
209209
url = https://github.com/NCAR/CUPiD.git
210-
fxtag = v0.1.4
210+
fxtag = v0.2.1
211211
fxrequired = ToplevelRequired
212212
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
213213

cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ nhtfrq=9,9,9,9,9,9
44
inithist='ENDOFRUN'
55

66
fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP',
7-
'CS_PIA','CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_RAINHARD','CS_SNOWCERT','CS_SNOWPOSS'
7+
'CS_PIA','CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_RAINHARD','CS_SNOWCERT','CS_SNOWPOSS',
8+
'CS_UN'
89

910
mode_defs=
1011
'mam4_mode1:accum:=', 'A:num_a1:N:num_c1:num_mr:+',
@@ -57,4 +58,4 @@ rad_diag_2=
5758
'M:mam4_m2_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode2_rrtmg_aitkendust_c141106.nc',
5859
'M:mam4_m3_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc',
5960
'M:mam4_mode4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc'
60-
61+

0 commit comments

Comments
 (0)