Skip to content

Commit 11f02f2

Browse files
singhbalwindersinghbalwinder
committed
Merge branch 'singhbalwinder/atm/bgc-lnd-atm-compset-fix' (PR #4827)
Modifies land-atm BGC compsets names and its use case files This PR adds use_case for v2 BGC land-atm codes and fixes typos in the alias. Smoke tests are also added for these compsets. * singhbalwinder/atm/bgc-lnd-atm-compset-fix: Changes grid to trigrid for the newly added system tests added smoke test to the compsets Update eam use_case files for 1850 and 20TR BGC compsets Replaces wildcard ? with * in BGC compsets Changes compset short names and BGC%B to BGC%? for lnd-atm compsets Adds co-cycle for BGC land atmosphere compset
2 parents 9664de8 + 8c8aca7 commit 11f02f2

File tree

5 files changed

+13
-174
lines changed

5 files changed

+13
-174
lines changed

‎cime_config/allactive/config_compsets.xml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
</compset>
191191

192192
<compset>
193-
<alias>BGCEXP_LNDATM_CNORDCTC_1850</alias>
193+
<alias>BGCEXP_LNDATM_CNPRDCTC_1850</alias>
194194
<lname>1850_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_BGC%LNDATM</lname>
195195
</compset>
196196

@@ -275,12 +275,7 @@
275275
</compset>
276276

277277
<compset>
278-
<alias>BGCEXP_LNDATM_CNORDCTC_20TR</alias>
279-
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_BGC%LNDATM</lname>
280-
</compset>
281-
282-
<compset>
283-
<alias>BGCEXP_LNDATM_CNORDCTC_20TR</alias>
278+
<alias>BGCEXP_LNDATM_CNPRDCTC_20TR</alias>
284279
<lname>20TR_EAM%CMIP6_ELM%CNPRDCTCBC_MPASSI%PRES_DOCN%DOM_SROF_SGLC_SWAV_BGC%LNDATM</lname>
285280
</compset>
286281

‎cime_config/tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
"PEM_Ln5.ne4_oQU240.F2010",
9595
"SMS_D_Ln5.ne4_oQU240.F2010.eam-cosplite_nhtfrq5",
9696
"SMS_Ln1.ne4_oQU240.F2010.eam-chem_pp",
97-
"SMS_Ln5.ne30pg2_EC30to60E2r2.BGCEXP_LNDATM_CNORDCTC_20TR",
98-
"SMS_Ln5.ne30pg2_EC30to60E2r2.BGCEXP_LNDATM_CNORDCTC_1850",
97+
"SMS_Ln5.ne30pg2_r05_EC30to60E2r2.BGCEXP_LNDATM_CNPRDCTC_20TR",
98+
"SMS_Ln5.ne30pg2_r05_EC30to60E2r2.BGCEXP_LNDATM_CNPRDCTC_1850",
9999
"SMS_D_Ln5.ne4_oQU240.F2010.eam-clubb_sp",
100100
"ERS_Ld5.ne4_oQU240.F2010.eam-rrtmgp",
101101
"ERS_Ld5.ne4_oQU240.F2010.eam-rrtmgpxx",

‎components/eam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml‎ renamed to ‎components/eam/bld/namelist_files/use_cases/1850_eam_CMIP6_bgc.xml‎

Lines changed: 2 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<cosp_lite>.true.</cosp_lite>
66

77
<!-- Solar constant from CMIP6 input4MIPS -->
8-
<solar_data_file>atm/cam/solar/Solar_1850control_input4MIPS_c20171101.nc</solar_data_file>
8+
<solar_data_file>atm/cam/solar/Solar_1850control_input4MIPS_c20181106.nc</solar_data_file>
99
<solar_data_ymd>18500101</solar_data_ymd>
1010
<solar_data_type>FIXED</solar_data_type>
1111

@@ -23,92 +23,11 @@
2323
<prescribed_volcaero_type >CYCLICAL </prescribed_volcaero_type >
2424
<prescribed_volcaero_cycle_yr>1 </prescribed_volcaero_cycle_yr>
2525

26-
<!-- Ice nucleation mods-->
27-
<use_hetfrz_classnuc >.true.</use_hetfrz_classnuc>
28-
<use_preexisting_ice >.false.</use_preexisting_ice>
29-
<hist_hetfrz_classnuc >.false.</hist_hetfrz_classnuc>
30-
<micro_mg_dcs_tdep >.true.</micro_mg_dcs_tdep>
31-
<microp_aero_wsub_scheme>1</microp_aero_wsub_scheme>
32-
33-
<!-- For Polar mods-->
34-
<sscav_tuning >.true.</sscav_tuning>
35-
<convproc_do_aer >.true.</convproc_do_aer>
36-
<convproc_do_gas >.false.</convproc_do_gas>
37-
<convproc_method_activate>2</convproc_method_activate>
38-
<demott_ice_nuc >.true.</demott_ice_nuc>
39-
<liqcf_fix >.true.</liqcf_fix>
40-
<regen_fix >.true.</regen_fix>
41-
<resus_fix >.true.</resus_fix>
42-
<mam_amicphys_optaa >1</mam_amicphys_optaa>
43-
44-
<fix_g1_err_ndrop>.true.</fix_g1_err_ndrop>
45-
<ssalt_tuning >.true.</ssalt_tuning>
46-
4726
<!-- For comprehensive history -->
4827
<history_amwg >.true.</history_amwg>
4928
<history_aerosol >.true.</history_aerosol>
5029
<history_aero_optics>.true.</history_aero_optics>
5130

52-
<!-- File for BC dep in snow feature -->
53-
<fsnowoptics>lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</fsnowoptics>
54-
55-
<!-- Radiation bugfix -->
56-
<use_rad_dt_cosz>.true.</use_rad_dt_cosz>
57-
58-
<!-- Tunable parameters for 72 layer model -->
59-
60-
<ice_sed_ai > 500.0 </ice_sed_ai>
61-
<cldfrc_dp1 > 0.045D0 </cldfrc_dp1>
62-
<clubb_ice_deep > 16.e-6 </clubb_ice_deep>
63-
<clubb_ice_sh > 50.e-6 </clubb_ice_sh>
64-
<clubb_liq_deep > 8.e-6 </clubb_liq_deep>
65-
<clubb_liq_sh > 10.e-6 </clubb_liq_sh>
66-
<clubb_C2rt > 1.75D0 </clubb_C2rt>
67-
<zmconv_c0_lnd > 0.007 </zmconv_c0_lnd>
68-
<zmconv_c0_ocn > 0.007 </zmconv_c0_ocn>
69-
<zmconv_dmpdz >-0.7e-3 </zmconv_dmpdz>
70-
<zmconv_ke > 5E-6 </zmconv_ke>
71-
<effgw_oro > 0.25 </effgw_oro>
72-
<seasalt_emis_scale > 0.85 </seasalt_emis_scale>
73-
<dust_emis_fact > 1.38D0 </dust_emis_fact>
74-
<clubb_gamma_coef > 0.32 </clubb_gamma_coef>
75-
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
76-
<clubb_C8 > 4.3 </clubb_C8>
77-
<cldfrc2m_rhmaxi > 1.05D0 </cldfrc2m_rhmaxi>
78-
<clubb_c_K10 > 0.3 </clubb_c_K10>
79-
<clubb_c_K10h > 0.3 </clubb_c_K10h>
80-
<effgw_beres > 0.4 </effgw_beres>
81-
<do_tms > .false. </do_tms>
82-
<so4_sz_thresh_icenuc > 0.05e-6 </so4_sz_thresh_icenuc>
83-
<n_so4_monolayers_pcage > 8.0D0 </n_so4_monolayers_pcage>
84-
<micro_mg_accre_enhan_fac> 1.5D0 </micro_mg_accre_enhan_fac>
85-
<zmconv_tiedke_add > 0.8D0 </zmconv_tiedke_add>
86-
<zmconv_cape_cin > 1 </zmconv_cape_cin>
87-
<zmconv_mx_bot_lyr_adj > 2 </zmconv_mx_bot_lyr_adj>
88-
<taubgnd > 2.5D-3 </taubgnd>
89-
<clubb_C1 > 1.335 </clubb_C1>
90-
<clubb_C1b > 1.335 </clubb_C1b>
91-
<raytau0 > 5.0D0 </raytau0>
92-
<prc_coef1 > 30500.0D0 </prc_coef1>
93-
<prc_exp > 3.19D0 </prc_exp>
94-
<prc_exp1 > -1.2D0 </prc_exp1>
95-
<clubb_C14 > 1.17D0 </clubb_C14>
96-
<relvar_fix > .true. </relvar_fix>
97-
<mg_prc_coeff_fix > .true. </mg_prc_coeff_fix>
98-
<rrtmg_temp_fix > .true. </rrtmg_temp_fix>
99-
100-
<!-- Energy fixer options -->
101-
<ieflx_opt > 2 </ieflx_opt>
102-
103-
104-
<!-- 1850 ozone data is from Jean-Francois Lamarque -->
105-
<!-- NOTE: I don't think this is used when rad_climate uses advected O3, but I don't think it does any harm either -->
106-
<prescribed_ozone_datapath>atm/cam/ozone</prescribed_ozone_datapath>
107-
<prescribed_ozone_file >ozone_1.9x2.5_L26_1850clim_c090420.nc</prescribed_ozone_file>
108-
<prescribed_ozone_name >O3</prescribed_ozone_name>
109-
<prescribed_ozone_type >CYCLICAL</prescribed_ozone_type>
110-
<prescribed_ozone_cycle_yr>1850</prescribed_ozone_cycle_yr>
111-
11231
<!-- External forcing for BAM or MAM. CMIP6 input4mips data -->
11332
<ext_frc_type >CYCLICAL</ext_frc_type>
11433
<ext_frc_cycle_yr >1850</ext_frc_cycle_yr>
@@ -138,7 +57,7 @@
13857
<!-- Prescribed oxidants for aerosol chemistry. Ozone is from CMIP6 input4MIPS file -->
13958
<tracer_cnst_type >CYCLICAL</tracer_cnst_type>
14059
<tracer_cnst_cycle_yr>1849</tracer_cnst_cycle_yr>
141-
<tracer_cnst_file >oxid_1.9x2.5_L26_1850-2015_c180203.nc</tracer_cnst_file>
60+
<tracer_cnst_file >oxid_1.9x2.5_L26_1850-2015_c20181106.nc</tracer_cnst_file>
14261
<tracer_cnst_filelist>''</tracer_cnst_filelist>
14362

14463
<!-- <tracer_cnst_filelist>this_field_is_not_used</tracer_cnst_filelist> -->

‎components/eam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml‎ renamed to ‎components/eam/bld/namelist_files/use_cases/20TR_eam_CMIP6_bgc.xml‎

Lines changed: 2 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -18,85 +18,11 @@
1818
<prescribed_volcaero_filetype>VOLC_CMIP6</prescribed_volcaero_filetype>
1919
<prescribed_volcaero_type>SERIAL</prescribed_volcaero_type>
2020

21-
<!-- Sea Surface Temperatures (SST) are specified using SSTICE in config_compsets.xml -->
22-
23-
<!-- Ice nucleation mods-->
24-
<use_hetfrz_classnuc >.true.</use_hetfrz_classnuc>
25-
<use_preexisting_ice >.false.</use_preexisting_ice>
26-
<hist_hetfrz_classnuc >.false.</hist_hetfrz_classnuc>
27-
<micro_mg_dcs_tdep >.true.</micro_mg_dcs_tdep>
28-
<microp_aero_wsub_scheme>1</microp_aero_wsub_scheme>
29-
30-
<!-- For Polar mods-->
31-
<sscav_tuning >.true.</sscav_tuning>
32-
<convproc_do_aer >.true.</convproc_do_aer>
33-
<convproc_do_gas >.false.</convproc_do_gas>
34-
<convproc_method_activate>2</convproc_method_activate>
35-
<demott_ice_nuc >.true.</demott_ice_nuc>
36-
<liqcf_fix >.true.</liqcf_fix>
37-
<regen_fix >.true.</regen_fix>
38-
<resus_fix >.true.</resus_fix>
39-
<mam_amicphys_optaa >1</mam_amicphys_optaa>
40-
41-
<fix_g1_err_ndrop>.true.</fix_g1_err_ndrop>
42-
<ssalt_tuning >.true.</ssalt_tuning>
43-
4421
<!-- For comprehensive history -->
45-
<history_amwg >.true.</history_amwg>
46-
<history_aerosol >.true.</history_aerosol>
22+
<history_amwg>.true.</history_amwg>
23+
<history_aerosol>.true.</history_aerosol>
4724
<history_aero_optics>.true.</history_aero_optics>
4825

49-
<!-- File for BC dep in snow feature -->
50-
<fsnowoptics>lnd/clm2/snicardata/snicar_optics_5bnd_mam_c160322.nc</fsnowoptics>
51-
52-
<!-- Radiation bugfix -->
53-
<use_rad_dt_cosz>.true.</use_rad_dt_cosz>
54-
55-
<!-- Tunable parameters for 72 layer model -->
56-
57-
<ice_sed_ai > 500.0 </ice_sed_ai>
58-
<cldfrc_dp1 > 0.045D0 </cldfrc_dp1>
59-
<clubb_ice_deep > 16.e-6 </clubb_ice_deep>
60-
<clubb_ice_sh > 50.e-6 </clubb_ice_sh>
61-
<clubb_liq_deep > 8.e-6 </clubb_liq_deep>
62-
<clubb_liq_sh > 10.e-6 </clubb_liq_sh>
63-
<clubb_C2rt > 1.75D0 </clubb_C2rt>
64-
<zmconv_c0_lnd > 0.007 </zmconv_c0_lnd>
65-
<zmconv_c0_ocn > 0.007 </zmconv_c0_ocn>
66-
<zmconv_dmpdz >-0.7e-3 </zmconv_dmpdz>
67-
<zmconv_ke > 5E-6 </zmconv_ke>
68-
<effgw_oro > 0.25 </effgw_oro>
69-
<seasalt_emis_scale > 0.85 </seasalt_emis_scale>
70-
<dust_emis_fact > 1.38D0 </dust_emis_fact>
71-
<clubb_gamma_coef > 0.32 </clubb_gamma_coef>
72-
<clubb_gamma_coefb> 0.32 </clubb_gamma_coefb>
73-
<clubb_C8 > 4.3 </clubb_C8>
74-
<cldfrc2m_rhmaxi > 1.05D0 </cldfrc2m_rhmaxi>
75-
<clubb_c_K10 > 0.3 </clubb_c_K10>
76-
<clubb_c_K10h > 0.3 </clubb_c_K10h>
77-
<effgw_beres > 0.4 </effgw_beres>
78-
<do_tms > .false. </do_tms>
79-
<so4_sz_thresh_icenuc > 0.05e-6 </so4_sz_thresh_icenuc>
80-
<n_so4_monolayers_pcage > 8.0D0 </n_so4_monolayers_pcage>
81-
<micro_mg_accre_enhan_fac> 1.5D0 </micro_mg_accre_enhan_fac>
82-
<zmconv_tiedke_add > 0.8D0 </zmconv_tiedke_add>
83-
<zmconv_cape_cin > 1 </zmconv_cape_cin>
84-
<zmconv_mx_bot_lyr_adj > 2 </zmconv_mx_bot_lyr_adj>
85-
<taubgnd > 2.5D-3 </taubgnd>
86-
<clubb_C1 > 1.335 </clubb_C1>
87-
<clubb_C1b > 1.335 </clubb_C1b>
88-
<raytau0 > 5.0D0 </raytau0>
89-
<prc_coef1 > 30500.0D0 </prc_coef1>
90-
<prc_exp > 3.19D0 </prc_exp>
91-
<prc_exp1 > -1.2D0 </prc_exp1>
92-
<clubb_C14 > 1.17D0 </clubb_C14>
93-
<relvar_fix > .true. </relvar_fix>
94-
<mg_prc_coeff_fix > .true. </mg_prc_coeff_fix>
95-
<rrtmg_temp_fix > .true. </rrtmg_temp_fix>
96-
97-
<!-- Energy fixer options -->
98-
<ieflx_opt > 2 </ieflx_opt>
99-
10026
<!-- External forcing for BAM or MAM. CMIP6 input4mips data -->
10127
<ext_frc_type>INTERP_MISSING_MONTHS</ext_frc_type>
10228
<so2_ext_file >atm/cam/chem/trop_mozart_aero/emis/DECK_ne30/cmip6_mam4_so2_elev_1850-2014_c180205.nc </so2_ext_file>
@@ -151,5 +77,4 @@
15177
<!-- sim_year used for CLM datasets and SSTs forcings -->
15278
<sim_year>1850-2000</sim_year>
15379

154-
15580
</namelist_defaults>

‎components/eam/cime_config/config_component.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<!-- -->
7272
<value compset="GEOS_EAM" >-offline_dyn</value>
7373
<value compset="GEOS_EAM" >-nlev 56</value>
74-
<value compset="_EAM.*_BGC%B" >-co2_cycle</value>
74+
<value compset="_EAM.*_BGC%*" >-co2_cycle</value>
7575
<value compset="EAM%SCAM" >-scam</value>
7676
<value compset="AR97_EAM%SCAM" >-phys default -scam -nlev 72 -clubb_sgs -chem linoz_mam4_resus_mom_soag -rain_evap_to_coarse_aero -bc_dep_to_snow_updates</value>
7777
<value compset="_EAM.%L60" >-nlev 60</value>
@@ -116,14 +116,14 @@
116116
<value compset="1850(?:SOI)?_EAM.*CMIP6" >1850_eam_CMIP6</value>
117117
<value compset="1850(?:SOI)?_EAM.*CMIP6-1pctCO2" >1850_eam_CMIP6-1pctCO2</value>
118118
<value compset="1950(?:SOI)?_EAM.*CMIP6" >1950_eam_CMIP6</value>
119-
<value compset="1850(?:SOI)?_EAM.*CMIP6.*_BGC%B" >1850_cam5_CMIP6_bgc</value>
119+
<value compset="1850(?:SOI)?_EAM.*CMIP6.*_BGC%*" >1850_eam_CMIP6_bgc</value>
120120
<value compset="2010(?:SOI)?_EAM.*CMIP6" >2010_eam_CMIP6</value>
121121
<value compset="1850(?:SOI)?_EAM.*AR5sf" >1850_E3SMv1_superfast_ar5-emis</value>
122122
<value compset="1850S_EAM.*AR5sf" >1850S_E3SMv1_superfast_ar5-emis</value>
123123
<value compset="20TR(?:SOI)?_EAM.*CMIP6" >20TR_eam_CMIP6</value>
124-
<value compset="20TR(?:SOI)?_EAM.*CMIP6.*_BGC%B" >20TR_cam5_CMIP6_bgc</value>
124+
<value compset="20TR(?:SOI)?_EAM.*CMIP6.*_BGC*" >20TR_eam_CMIP6_bgc</value>
125125
<value compset="SSP585(?:SOI)?_EAM.*CMIP6">SSP585_cam5_CMIP6</value>
126-
<value compset="SSP585(?:SOI)?_EAM.*CMIP6.*_BGC%B">SSP585_cam5_CMIP6_bgc</value>
126+
<value compset="SSP585(?:SOI)?_EAM.*CMIP6.*_BGC%*">SSP585_cam5_CMIP6_bgc</value>
127127
<value compset="20TR(?:SOI)?_EAM.*AR5sf" >20TR_E3SMv1_superfast_ar5-emis</value>
128128
<value compset="20TRS_EAM.*AR5sf">20TRS_E3SMv1_superfast_ar5-emis</value>
129129
<value compset="1850(?:SOI)?_EAM%WCCM" >waccm_1850_cam5</value>
@@ -219,7 +219,7 @@
219219
<desc compset="AMIP">Atmospheric Model Intercomparison Project protocol: </desc>
220220
<desc compset="_EAM%MG1M" >MG1.0 w/ modified activation:</desc>
221221
<desc compset="_EAM%UNI" >UNICON (modified mg1.0):</desc>
222-
<desc compset="EAM.*_BGC%B">EAM prognostic CO2 cycle turned on.</desc>
222+
<desc compset="EAM.*_BGC%*">EAM prognostic CO2 cycle turned on.</desc>
223223
<!-- MMF / Super-Parameterization -->
224224
<desc compset="_EAM%MMF1" >E3SM-MMF (Fortran w/ OpenACC offload),RRTMGP, 1-mom micro, prescribed aerosol</desc>
225225
<desc compset="_EAM%MMF2-ECPP">E3SM-MMF (Fortran no GPU offload), RRTMGP, 2-mom micro, prognostic aerosol, ECPP </desc>

0 commit comments

Comments
 (0)