Skip to content

Commit 04132e8

Browse files
singhbalwindersinghbalwinder
committed
Fixes a bug with GNU and ne4 sim on PM GNU
1 parent c8e963a commit 04132e8

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

‎components/eamxx/cime_config/namelist_defaults_scream.xml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -253,27 +253,18 @@ be lost if SCREAM_HACK_XML is not enabled.
253253
<!-- MAM4xx-Aerosol-Microphysics -->
254254
<mam4_aero_microphys inherit="atm_proc_base">
255255
<mam4_linoz_ymd type="integer" > 20100101</mam4_linoz_ymd>
256-
<mam4_linoz_file_name hgrid="ne4np4" type="file" doc=""> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne4pg2_c20240724.nc</mam4_linoz_file_name>
257256
<mam4_linoz_file_name type="file" doc=""> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne30pg2_c20240724.nc</mam4_linoz_file_name>
257+
<mam4_linoz_file_name hgrid="ne4np4.pg2" type="file" doc=""> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne4pg2_c20240724.nc</mam4_linoz_file_name>
258258
<mam4_oxid_ymd type="integer" > 20150101 </mam4_oxid_ymd>
259-
<mam4_oxid_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_1850-2015_ne4pg2_c20241009.nc</mam4_oxid_file_name>
260259
<mam4_oxid_file_name type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_1850-2015_ne30pg2_c20241009.nc</mam4_oxid_file_name>
260+
<mam4_oxid_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_1850-2015_ne4pg2_c20241009.nc</mam4_oxid_file_name>
261+
261262
<mam4_chlorine_loading_ymd type="integer" doc=""> 20100101 </mam4_chlorine_loading_ymd>
262263
<mam4_linoz_chlorine_file type="file" doc=""> ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc</mam4_linoz_chlorine_file>
263264
<mam4_rsf_file type="file" doc=""> ${DIN_LOC_ROOT}/atm/scream/mam4xx/photolysis/RSF_GT200nm_v3.0_c080811.nc</mam4_rsf_file>
264265
<mam4_xs_long_file type="file" doc=""> ${DIN_LOC_ROOT}/atm/scream/mam4xx/photolysis/temp_prs_GT200nm_JPL10_c130206.nc</mam4_xs_long_file>
265266

266267
<verti_emiss_ymd type="integer"> 20100101 </verti_emiss_ymd>
267-
<!-- For ne4 grids -->
268-
<mam4_so2_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so2_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_so2_verti_emiss_file_name>
269-
<mam4_so4_a1_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a1_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_so4_a1_verti_emiss_file_name>
270-
<mam4_so4_a2_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a2_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_so4_a2_verti_emiss_file_name>
271-
<mam4_pom_a4_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_pom_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_pom_a4_verti_emiss_file_name>
272-
<mam4_bc_a4_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_bc_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_bc_a4_verti_emiss_file_name>
273-
<mam4_num_a1_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a1_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_num_a1_verti_emiss_file_name>
274-
<mam4_num_a2_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a2_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_num_a2_verti_emiss_file_name>
275-
<mam4_num_a4_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_num_a4_verti_emiss_file_name>
276-
<mam4_soag_verti_emiss_file_name hgrid="ne4np4" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_soag_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_soag_verti_emiss_file_name>
277268
<!-- For all other grids -->
278269
<mam4_so2_verti_emiss_file_name type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne30pg2/elevated/cmip6_mam4_so2_elev_1x1_2010_clim_ne30pg2_c20241008.nc </mam4_so2_verti_emiss_file_name>
279270
<mam4_so4_a1_verti_emiss_file_name type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne30pg2/elevated/cmip6_mam4_so4_a1_elev_1x1_2010_clim_ne30pg2_c20241008.nc </mam4_so4_a1_verti_emiss_file_name>
@@ -284,6 +275,17 @@ be lost if SCREAM_HACK_XML is not enabled.
284275
<mam4_num_a2_verti_emiss_file_name type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne30pg2/elevated/cmip6_mam4_num_a2_elev_1x1_2010_clim_ne30pg2_c20241008.nc </mam4_num_a2_verti_emiss_file_name>
285276
<mam4_num_a4_verti_emiss_file_name type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne30pg2/elevated/cmip6_mam4_num_a4_elev_1x1_2010_clim_ne30pg2_c20241008.nc </mam4_num_a4_verti_emiss_file_name>
286277
<mam4_soag_verti_emiss_file_name type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne30pg2/elevated/cmip6_mam4_soag_elev_1x1_2010_clim_ne30pg2_c20241008.nc </mam4_soag_verti_emiss_file_name>
278+
279+
<!-- For ne4 grids -->
280+
<mam4_so2_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so2_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_so2_verti_emiss_file_name>
281+
<mam4_so4_a1_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a1_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_so4_a1_verti_emiss_file_name>
282+
<mam4_so4_a2_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_so4_a2_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_so4_a2_verti_emiss_file_name>
283+
<mam4_pom_a4_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_pom_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_pom_a4_verti_emiss_file_name>
284+
<mam4_bc_a4_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_bc_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_bc_a4_verti_emiss_file_name>
285+
<mam4_num_a1_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a1_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_num_a1_verti_emiss_file_name>
286+
<mam4_num_a2_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a2_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_num_a2_verti_emiss_file_name>
287+
<mam4_num_a4_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_num_a4_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_num_a4_verti_emiss_file_name>
288+
<mam4_soag_verti_emiss_file_name hgrid="ne4np4.pg2" type="file" doc="">${DIN_LOC_ROOT}/atm/scream/mam4xx/emissions/ne4pg2/elevated/cmip6_mam4_soag_elev_1x1_2010_clim_ne4pg2_c20241008.nc </mam4_soag_verti_emiss_file_name>
287289
</mam4_aero_microphys>
288290

289291
<!-- MAM4xx-Optics -->

‎components/eamxx/src/physics/mam/eamxx_mam_microphysics_process_interface.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class MAMMicrophysics final : public scream::AtmosphereProcess {
4646
AtmosphereProcessType type() const override;
4747

4848
// The name of the subcomponent
49-
std::string name() const const { return "mam_aero_microphysics"; }
49+
std::string name() const { return "mam_aero_microphysics"; }
5050

5151
// set aerosol microphysics configuration parameters (called by constructor)
5252
void configure(const ekat::ParameterList &params);

0 commit comments

Comments
 (0)