Skip to content

Commit 27cea0e

Browse files
fvittfvitt
authored
Merge pull request #1375 from fvitt/prescribed_mam5_strataero
cam6_4_122: Prescribed MAM5 volcanic forcings
2 parents fbcb08e + d0308c8 commit 27cea0e

File tree

8 files changed

+210
-26
lines changed

8 files changed

+210
-26
lines changed

‎.gitmodules‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
path = chem_proc
33
url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
44
fxrequired = AlwaysRequired
5-
fxtag = chem_proc5_0_06
5+
fxtag = chem_proc5_0_07
66
fxDONOTUSEurl = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git
77

88
[submodule "carma"]
@@ -204,4 +204,3 @@ url = https://github.com/NCAR/CUPiD.git
204204
fxtag = v0.3.1
205205
fxrequired = ToplevelRequired
206206
fxDONOTUSEurl = https://github.com/NCAR/CUPiD.git
207-

‎chem_proc‎

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1542,7 +1542,7 @@
15421542
<option name="comment">CAM7-LT aquaplanet</option>
15431543
</options>
15441544
</test>
1545-
<test compset="FHISTC_MTso" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s">
1545+
<test compset="FHISTC_MTso" grid="ne30pg3_ne30pg3_mt232" name="ERP_D_Ln9" testmods="cam/outfrq9s_cam7_presc_volc">
15461546
<machines>
15471547
<machine name="derecho" compiler="intel" category="prealpha"/>
15481548
</machines>

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_cam7_presc_volc/shell_commands‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
./xmlchange ROF_NCPL=\$ATM_NCPL
2+
./xmlchange GLC_NCPL=\$ATM_NCPL
3+
./xmlchange RUN_STARTDATE=2000-01-01

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_cam7_presc_volc/user_nl_cam‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
mfilt=1,1,1,1,1,1,1,1,1,1
2+
ndens=1,1,1,1,1,1,1,1,1,1
3+
nhtfrq=9,9,9,9,9,9,9,9,9,9
4+
write_nstep0=.true.
5+
inithist='ENDOFRUN'
6+
7+
prescribed_strataero_datapath = '$DIN_LOC_ROOT/atm/cam/volc'
8+
prescribed_strataero_file = 'TEST_ONLY_strataero_mam5_1980_2014_c20250826.nc'
9+
prescribed_strataero_type = 'SERIAL'
10+
prescribed_strataero_use_chemtrop = .true.
11+
12+
rad_climate =
13+
'A:Q:H2O', 'N:O2:O2', 'A:CO2:CO2', 'N:ozone:O3', 'A:N2O:N2O', 'A:CH4:CH4', 'N:CFC11STAR:CFC11', 'A:CFC12:CFC12',
14+
'M:mam4_mode1:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_sig1.6_dgnh.48_c140304.nc',
15+
'M:mam4_mode2:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode2_rrtmg_aitkendust_c141106.nc',
16+
'M:mam4_mode3:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc',
17+
'M:mam4_mode4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc',
18+
'N:VOLC_MMR1:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.6_mode1_c210211.nc',
19+
'N:VOLC_MMR2:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.6_mode2_c210211.nc',
20+
'N:VOLC_MMR3:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.2_mode3_c210211.nc',
21+
'N:VOLC_MMR5:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.2_mode3_c210211.nc'
22+
23+
fincl2 = 'VOLC_MMR1','VOLC_MMR2','VOLC_MMR3','VOLC_MMR5','VOLC_RAD_GEOM1','VOLC_RAD_GEOM2','VOLC_RAD_GEOM3','VOLC_RAD_GEOM5',
24+
'VOLC_SAD'

‎cime_config/testdefs/testmods_dirs/cam/outfrq9s_cam7_presc_volc/user_nl_clm‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
!----------------------------------------------------------------------------------
2+
! Users should add all user specific namelist changes below in the form of
3+
! namelist_var = new_namelist_value
4+
!
5+
! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
6+
! are set in the CLM_NAMELIST_OPTS env variable.
7+
!
8+
! EXCEPTIONS:
9+
! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
10+
! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
11+
! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
12+
! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
13+
! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
14+
! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
15+
! Set dtime with L_NCPL option
16+
! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
17+
! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
18+
! (includes $inst_string for multi-ensemble cases)
19+
! Set glc_grid with CISM_GRID option
20+
! Set glc_smb with GLC_SMB option
21+
! Set maxpatch_glcmec with GLC_NEC option
22+
! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
23+
!----------------------------------------------------------------------------------
24+
hist_nhtfrq = 9
25+
hist_mfilt = 1
26+
hist_ndens = 1
27+

‎doc/ChangeLog‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,70 @@
1+
===============================================================
2+
3+
Tag name: cam6_4_122
4+
Originator(s): fvitt
5+
Date: 2 Oct 2025
6+
One-line Summary: Enable prescribed MAM5 volcanic forcings; chemistry preprocessor fix
7+
Github PR URLs:
8+
https://github.com/ESCOMP/CAM/pull/1375
9+
https://github.com/ESCOMP/CAM/pull/1391
10+
11+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
12+
13+
Enable the use of prescribed MAM5 stratospheric volcanic aerosol forcings.
14+
(Updates needed for prescribed MAM5 stratospheric aerosols #1187)
15+
16+
Fix an issue with the chemistry preprocessor on derecho.
17+
(Chemistry preprocessor broken on derecho #1389)
18+
19+
Describe any changes made to build system: N/A
20+
21+
Describe any changes made to the namelist: N/A
22+
23+
List any changes to the defaults for the boundary datasets: N/A
24+
25+
Describe any substantial timing or memory changes: N/A
26+
27+
Code reviewed by: cacraigucar
28+
29+
List all files eliminated: N/A
30+
31+
List all files added and what they do:
32+
33+
A cime_config/testdefs/testmods_dirs/cam/outfrq9s_cam7_presc_volc/shell_commands
34+
A cime_config/testdefs/testmods_dirs/cam/outfrq9s_cam7_presc_volc/user_nl_cam
35+
A cime_config/testdefs/testmods_dirs/cam/outfrq9s_cam7_presc_volc/user_nl_clm
36+
- add regression test for precscribed MAM5 stratospheric aerosols
137

38+
List all existing files that have been modified, and describe the changes:
39+
40+
M .gitmodules
41+
M chem_proc
42+
- update preprocessor to tag cam_proc5_0_07
43+
44+
M cime_config/testdefs/testlist_cam.xml
45+
- regression test for precscribed MAM5 stratospheric aerosols
46+
47+
M src/chemistry/utils/prescribed_strataero.F90
48+
- add ability to include precscribed MAM5 stratospheric aerosols
49+
50+
If there were any failures reported from running test_driver.sh on any test
51+
platform, and checkin with these failures has been OK'd by the gatekeeper,
52+
then copy the lines from the td.*.status files for the failed tests to the
53+
appropriate machine below. All failed tests must be justified.
54+
55+
derecho/intel/aux_cam: All PASS
56+
57+
derecho/nvhpc/aux_cam:
58+
FAIL ERS_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_nvhpc.cam-outfrq9s_gpu_default RUN time=441
59+
- pre-existing failure -- might be related to https://github.com/ESCOMP/CAM/issues/1383
60+
61+
izumi/nag/aux_cam: All PASS
62+
63+
izumi/gnu/aux_cam: All PASS
64+
65+
Summarize any changes to answers: bit-for-bit unchanged
66+
67+
===============================================================
268
===============================================================
369

470
Tag name: cam6_4_121

0 commit comments

Comments
 (0)