Skip to content

Commit 6dc2605

Browse files
fvittSteve Goldhaber
fvitt
authored and
Steve Goldhaber
committed
ESCOMP tag: cam6_4_077
Merge pull request ESCOMP#1262 from fvitt/waccm7 cam6_4_077: WACCM7(x) compsets ESCOMP commit: 44c1893
1 parent adb43aa commit 6dc2605

24 files changed

+18157
-22
lines changed

‎bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<start_ymd>19790101</start_ymd>
6+
7+
<!-- Solar data from NRL -->
8+
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
9+
10+
<!-- Kp and F10.7 -->
11+
<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_parms_data_file>
12+
13+
<!-- Energetic Particle Precipitation -->
14+
<epp_all_filepath>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</epp_all_filepath>
15+
<epp_all_varname>'epp_ion_rates'</epp_all_varname>
16+
17+
<!--Species IC -->
18+
<ncdata dyn="se" hgrid="ne30np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
19+
<ncdata dyn="se" hgrid="ne16np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne16pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
20+
<ncdata dyn="se" hgrid="ne30np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc</ncdata>
21+
<ncdata dyn="se" hgrid="ne16np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc</ncdata>
22+
23+
<!-- topography -->
24+
<bnd_topo dyn="se" hgrid="ne16np4" npg="3">atm/cam/topo/se/ne16pg3_gmted2010_modis_bedmachine_nc3000_Laplace0200_20230202.nc</bnd_topo>
25+
26+
<!-- LBC, UBC Files -->
27+
<flbc_type>SERIAL</flbc_type>
28+
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
29+
<flbc_list>
30+
'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
31+
'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'CH2BR2', 'CHBR3', 'H2402', 'OCS', 'CFC11eq'
32+
</flbc_list>
33+
34+
<!-- Upper Boundary -->
35+
<tgcm_ubc_file>atm/waccm/ub/tgcm_ubc_1850-2100_c100204.nc</tgcm_ubc_file>
36+
<tgcm_ubc_data_type>'INTERP_MISSING_MONTHS'</tgcm_ubc_data_type>
37+
38+
<!-- Emissions -->
39+
<csw_time_type>SERIAL</csw_time_type>
40+
41+
<!-- External forcing -->
42+
<ext_frc_type>INTERP_MISSING_MONTHS</ext_frc_type>
43+
44+
<!-- Surface emissions -->
45+
<srf_emis_type>INTERP_MISSING_MONTHS</srf_emis_type>
46+
47+
<!-- History Streams -->
48+
49+
<mfilt> 1, 30, 120, 240, 240, 480, 365, 73, 30 </mfilt>
50+
<nhtfrq> 0, -24, -6, -3, -1, 1, -24,-120,-240 </nhtfrq>
51+
<avgflag_pertape> 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I'</avgflag_pertape>
52+
53+
<history_cesm_forcing>.true.</history_cesm_forcing>
54+
<history_scwaccm_forcing>.true. </history_scwaccm_forcing>
55+
<history_waccm>.true.</history_waccm>
56+
<history_amwg>.true.</history_amwg>
57+
<history_carma>.false.</history_carma>
58+
<history_clubb>.false.</history_clubb>
59+
<history_chemistry>.false.</history_chemistry>
60+
<history_chemspecies_srf>.false.</history_chemspecies_srf>
61+
<history_aerosol>.false.</history_aerosol>
62+
<history_aero_optics>.false.</history_aero_optics>
63+
64+
<gw_qbo_hdepth_scaling>0.25D0</gw_qbo_hdepth_scaling>
65+
66+
</namelist_defaults>

‎bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<start_ymd>19790101</start_ymd>
6+
7+
<!-- Solar data from NRL -->
8+
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
9+
10+
<!-- Kp and F10.7 -->
11+
<solar_parms_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_parms_data_file>
12+
13+
<!--Species IC -->
14+
<ncdata dyn="se" hgrid="ne30np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne30pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
15+
<ncdata dyn="se" hgrid="ne16np4" nlev="135">atm/waccm/ic/FHIST_WAt1ma_ne16pg3_spinup01.cam.i.1980-01-01-00000_c250124.nc</ncdata>
16+
<ncdata dyn="se" hgrid="ne30np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne30pg3_spinup03.cam.i.1980-01-01-00000_c250201.nc</ncdata>
17+
<ncdata dyn="se" hgrid="ne16np4" nlev="189">atm/waccm/ic/FHIST_WXma_ne16pg3_spinup02.cam.i.1980-01-01-00000_c250201.nc</ncdata>
18+
19+
<!-- topography -->
20+
<bnd_topo dyn="se" hgrid="ne16np4" npg="3">atm/cam/topo/se/ne16pg3_gmted2010_modis_bedmachine_nc3000_Laplace0200_20230202.nc</bnd_topo>
21+
22+
<!-- LBC, UBC Files -->
23+
<flbc_type>SERIAL</flbc_type>
24+
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
25+
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
26+
27+
<!-- upper atmos forcings -->
28+
<waccm_forcing_type>INTERP_MISSING_MONTHS</waccm_forcing_type>
29+
<waccm_forcing_file>SCWACCM_forcing_zm_L70_1849-2015_CMIP6ensAvg_c181011.nc</waccm_forcing_file>
30+
<waccm_forcing_datapath>atm/waccm/waccm_forcing</waccm_forcing_datapath>
31+
32+
<!-- ozone data -->
33+
<prescribed_ozone_datapath> 'atm/cam/ozone_strataero' </prescribed_ozone_datapath>
34+
<prescribed_ozone_file > 'ozone_strataero_WACCM_L70_zm5day_18500101-20150103_CMIP6ensAvg_c180923.nc' </prescribed_ozone_file>
35+
<prescribed_ozone_name > 'O3' </prescribed_ozone_name>
36+
<prescribed_ozone_type > SERIAL </prescribed_ozone_type>
37+
38+
<!-- Prescribed stratospheric aerosols -->
39+
<prescribed_strataero_use_chemtrop> .true. </prescribed_strataero_use_chemtrop>
40+
<prescribed_strataero_datapath > 'atm/cam/ozone_strataero' </prescribed_strataero_datapath>
41+
<prescribed_strataero_file > 'ozone_strataero_WACCM_L70_zm5day_18500101-20150103_CMIP6ensAvg_c180923.nc' </prescribed_strataero_file>
42+
<prescribed_strataero_type > SERIAL </prescribed_strataero_type>
43+
44+
<!-- Prescribed oxidants for aerosol chemistry -->
45+
<tracer_cnst_datapath > 'atm/cam/tracer_cnst' </tracer_cnst_datapath>
46+
<tracer_cnst_file > 'tracer_cnst_halons_3D_L70_1849-2015_CMIP6ensAvg_c180927.nc' </tracer_cnst_file>
47+
<tracer_cnst_specifier> 'O3','OH','NO3','HO2','HALONS' </tracer_cnst_specifier>
48+
<tracer_cnst_type > INTERP_MISSING_MONTHS </tracer_cnst_type>
49+
<tracer_cnst_filelist > '' </tracer_cnst_filelist>
50+
51+
<!-- Emissions -->
52+
<csw_time_type>SERIAL</csw_time_type>
53+
54+
<!-- External forcing -->
55+
<ext_frc_type>INTERP_MISSING_MONTHS</ext_frc_type>
56+
57+
<!-- Surface emissions -->
58+
<srf_emis_type>INTERP_MISSING_MONTHS</srf_emis_type>
59+
60+
<!-- History Streams -->
61+
62+
<mfilt> 1, 30, 120, 240, 240, 480, 365, 73, 30 </mfilt>
63+
<nhtfrq> 0, -24, -6, -3, -1, 1, -24,-120,-240 </nhtfrq>
64+
<avgflag_pertape> 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I'</avgflag_pertape>
65+
66+
<history_cesm_forcing>.true.</history_cesm_forcing>
67+
<history_scwaccm_forcing>.true. </history_scwaccm_forcing>
68+
<history_waccm>.true.</history_waccm>
69+
<history_amwg>.true.</history_amwg>
70+
<history_carma>.false.</history_carma>
71+
<history_clubb>.false.</history_clubb>
72+
<history_chemistry>.false.</history_chemistry>
73+
<history_chemspecies_srf>.false.</history_chemspecies_srf>
74+
<history_aerosol>.false.</history_aerosol>
75+
<history_aero_optics>.false.</history_aero_optics>
76+
77+
<gw_qbo_hdepth_scaling>0.25D0</gw_qbo_hdepth_scaling>
78+
79+
<sim_year>1850-2015</sim_year>
80+
81+
</namelist_defaults>

‎cime‎

Submodule cime updated 31 files

‎cime_config/config_pes.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@
339339
</pes>
340340
</mach>
341341
<mach name="derecho">
342-
<pes pesize="any" compset="_CAM\d0%WX">
342+
<pes pesize="any" compset="_CAM\d0%W(X|A)">
343343
<comment>none</comment>
344344
<ntasks>
345345
<ntasks_atm>-4</ntasks_atm>
@@ -397,7 +397,7 @@
397397
</pes>
398398
</mach>
399399
<mach name="derecho">
400-
<pes pesize="any" compset="_CAM\d0%WX">
400+
<pes pesize="any" compset="_CAM\d0%W(X|A)">
401401
<comment>none</comment>
402402
<ntasks>
403403
<ntasks_atm>-16</ntasks_atm>

‎doc/ChangeLog‎

Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,143 @@
11
===============================================================
22

3+
Tag name: cam6_4_077
4+
Originator(s): fvitt
5+
Date: 18 Mar 2025
6+
One-line Summary: Introduce HIST WACCM7(X) compsets
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1262
8+
9+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
10+
11+
Add WACCM(X)7 compsets #1248
12+
Add WACCM T4MA chemistry mechanism
13+
Fix vertical indexing mismatch in rrtmgp/mcica_subcol_gen.F90 in high-top configuration #1261
14+
Update geomagnitic reference field coeficients for WACCM and WACCMX to IGRF 14
15+
16+
Describe any changes made to build system: N/A
17+
18+
Describe any changes made to the namelist: N/A
19+
20+
List any changes to the defaults for the boundary datasets: N/A
21+
22+
Describe any substantial timing or memory changes: N/A
23+
24+
Code reviewed by: brian-eaton, cacraigucar, PeterHjortLauritzen
25+
26+
List all files eliminated: N/A
27+
28+
List all files added and what they do:
29+
A bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
30+
A bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
31+
- build-namelist use case files for WACCM7(X) compsets
32+
33+
A src/chemistry/pp_waccm_t4ma_mam5/chem_mech.doc
34+
A src/chemistry/pp_waccm_t4ma_mam5/chem_mech.in
35+
A src/chemistry/pp_waccm_t4ma_mam5/chem_mods.F90
36+
A src/chemistry/pp_waccm_t4ma_mam5/m_rxt_id.F90
37+
A src/chemistry/pp_waccm_t4ma_mam5/m_spc_id.F90
38+
A src/chemistry/pp_waccm_t4ma_mam5/mo_adjrxt.F90
39+
A src/chemistry/pp_waccm_t4ma_mam5/mo_exp_sol.F90
40+
A src/chemistry/pp_waccm_t4ma_mam5/mo_imp_sol.F90
41+
A src/chemistry/pp_waccm_t4ma_mam5/mo_indprd.F90
42+
A src/chemistry/pp_waccm_t4ma_mam5/mo_lin_matrix.F90
43+
A src/chemistry/pp_waccm_t4ma_mam5/mo_lu_factor.F90
44+
A src/chemistry/pp_waccm_t4ma_mam5/mo_lu_solve.F90
45+
A src/chemistry/pp_waccm_t4ma_mam5/mo_nln_matrix.F90
46+
A src/chemistry/pp_waccm_t4ma_mam5/mo_phtadj.F90
47+
A src/chemistry/pp_waccm_t4ma_mam5/mo_prod_loss.F90
48+
A src/chemistry/pp_waccm_t4ma_mam5/mo_rxt_rates_conv.F90
49+
A src/chemistry/pp_waccm_t4ma_mam5/mo_setrxt.F90
50+
A src/chemistry/pp_waccm_t4ma_mam5/mo_sim_dat.F90
51+
- new WACCM T4MA chemistry mechanism
52+
53+
List all existing files that have been modified, and describe the changes:
54+
55+
M bld/build-namelist
56+
- namelist setting for
57+
. T4MA chemistry
58+
. HT model top
59+
60+
M bld/config_files/definition.xml
61+
- expand model_top to include
62+
. "ht" -- high-top waccm
63+
. "xt" -- extended-top waccmx
64+
- include waccmx_t4ma_mam5 chemistry mechanism
65+
66+
M bld/configure
67+
- set default nlev according to model_top
68+
69+
M bld/namelist_files/namelist_defaults_cam.xml
70+
- update igrf_geomag_coefs files to IGRF14
71+
- default namelist settings for model_top ht and xt (se_* and gw)
72+
73+
M cime_config/config_component.xml
74+
M cime_config/config_compsets.xml
75+
- implement WACCM7(X) compsets
76+
77+
M cime_config/config_pes.xml
78+
- default PE-layouts for ACCM7(X) compsets on derecho
79+
80+
M cime_config/testdefs/testlist_cam.xml
81+
- add regression test for WACCM7(X) compsets
82+
- fix broken WACCMX AMIE test by using aqua-planet mode
83+
84+
M src/physics/rrtmgp/mcica_subcol_gen.F90
85+
- fix indexing mismatch issue with higher top models
86+
87+
If there were any failures reported from running test_driver.sh on any test
88+
platform, and checkin with these failures has been OK'd by the gatekeeper,
89+
then copy the lines from the td.*.status files for the failed tests to the
90+
appropriate machine below. All failed tests must be justified.
91+
92+
derecho/intel/aux_cam:
93+
94+
FAIL SMS_D_Ln9_P1280x1.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.FHIST.derecho_intel.cam-outfrq9s
95+
FAIL SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s
96+
- pre-existing failures due to build-namelist error requiring CLM/CTSM external update
97+
98+
FAIL ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s
99+
DIFF SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h
100+
- pre-existing failures due to HEMCO not having reproducible results (issues #1018 and #856)
101+
102+
DIFF ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d
103+
DIFF ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s
104+
FAIL ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s
105+
DIFF SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s
106+
DIFF SMS_D_Ln9.ne16_ne16_mg17.QPX2000.derecho_intel.cam-outfrq9s_amie
107+
- new tests -- no baselines to compare against
108+
109+
NLFAIL ERP_Lh12.f19_f19_mg17.FW4madSD.derecho_intel.cam-outfrq3h
110+
NLFAIL ERS_Ln9.f09_f09_mg17.FX2000.derecho_intel.cam-outfrq9s
111+
NLFAIL ERS_Ln9.f19_f19_mg17.FXSD.derecho_intel.cam-outfrq9s
112+
NLFAIL SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s
113+
NLFAIL SMS_D_Ln9.f19_f19_mg17.FWma2000climo.derecho_intel.cam-outfrq9s_waccm_ma_mam4
114+
NLFAIL SMS_Ld1.f09_f09_mg17.FW2000climo.derecho_intel.cam-outfrq1d
115+
NLFAIL SMS_Ln9.f09_f09_mg17.FW1850.derecho_intel.cam-reduced_hist3s
116+
NLFAIL SMS_Ln9.ne30pg3_ne30pg3_mg17.FW2000climo.derecho_intel.cam-outfrq9s_rrtmgp
117+
- namelist compare failures due to geomag IGRF inputs updates
118+
119+
derecho/nvhpc/aux_cam: All PASS
120+
121+
izumi/nag/aux_cam:
122+
123+
NLFAIL ERC_D_Ln9.f10_f10_mg37.QPWmaC6.izumi_nag.cam-outfrq3s
124+
NLFAIL SMS_D_Ln3.ne5pg3_ne5pg3_mg37.QPX2000.izumi_nag.cam-outfrq3s
125+
NLFAIL SMS_D_Ln6.ne5_ne5_mg37.QPWmaC4.izumi_nag.cam-outfrq3s_physgrid_tem
126+
- namelist compare failures due to geomag IGRF inputs updates
127+
128+
izumi/gnu/aux_cam:
129+
DIFF ERP_Ln9_P24x2.f45_f45_mg37.QPWmaC6.izumi_gnu.cam-outfrq9s_mee_fluxes
130+
- here change in geomag IGRF inputs caused differences due to start date in 2015
131+
132+
NLFAIL SMS_D_Ln9.f10_f10_mg37.QPWmaC4.izumi_gnu.cam-outfrq9s_apmee
133+
NLFAIL SMS_P48x1_D_Ln9.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s
134+
- namelist compare failures due to geomag IGRF inputs updates
135+
136+
Summarize any changes to answers: bit-for-bit unchanged
137+
138+
===============================================================
139+
===============================================================
140+
3141
Tag name: cam6_4_076
4142
Originator(s): eaton
5143
Date: 17 March 2025

0 commit comments

Comments
 (0)