diff --git a/bld/build-namelist b/bld/build-namelist
index 4b8c43929e..dcdf858f81 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -3747,7 +3747,7 @@ if (!$simple_phys) {
}
if ($waccm_phys or
- (!$simple_phys and $cfg->get('nlev') >= 60)) {
+ (!$simple_phys and $cfg->get('nlev') >= 60) and $dyn !~ /mpas/) {
# Spectral gravity waves are part of WACCM physics, and also drive the
# QBO in the high vertical resolution configuration.
add_default($nl, 'use_gw_front' , 'val'=>'.true.');
@@ -3770,7 +3770,7 @@ if ($waccm_phys or
}
add_default($nl, 'gw_qbo_hdepth_scaling', 'val'=>$hdepth_scaling);
add_default($nl, 'gw_top_taper');
-} elsif ($phys =~ /cam_dev/) {
+} elsif ($phys =~ /cam_dev/ and $dyn !~ /mpas/) {
# cam_dev settings for nlev<60 (Other cam_dev set above)
add_default($nl, 'use_gw_front' , 'val'=>'.true.');
add_default($nl, 'use_gw_convect_dp', 'val'=>'.true.');
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
index cd616aad15..93b7bb1101 100644
--- a/bld/namelist_files/namelist_defaults_cam.xml
+++ b/bld/namelist_files/namelist_defaults_cam.xml
@@ -287,19 +287,19 @@
atm/waccm/ic/mpasa120km.waccm_fulltopo_c220818.nc
atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c211013.nc
-atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa480_L32_CFSR_c240508.nc
+
atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c210426.nc
-atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L32_CFSR_c240508.nc
+
atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa60_L32_CFSR_c210518.nc
-atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa60_L32_CFSR_c240508.nc
+
atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa30_L32_CFSR_230302.nc
-atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa30_L32_CFSR_c240508.nc
+
atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_c230901.nc
-atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa120_L58_CFSR_c240508.nc
+
atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa15_L58_c230316.nc
-atm/cam/inic/mpas/cami_01-01-2000_00Z_mpasa15_L58_CFSR_c240508.nc
+
atm/cam/topo/topo-from-cami_0000-01-01_256x512_L26_c030918.nc
@@ -357,19 +357,19 @@
atm/cam/topo/se/ne30x8_ARCTICGRIS_nc3000_Co060_Fi001_MulG_PF_RR_Nsw042_c200428.nc
atm/cam/topo/mpas_480_nc3000_Co240_Fi001_MulG_PF_Nsw170.nc
-atm/cam/topo/mpas/mpasa480_gmted2010_modis_bedmachine_nc3000_Laplace0400_noleak_20240507.nc
+
atm/cam/topo/mpas/mpas_120_nc3000_Co060_Fi001_MulG_PF_Nsw042_c200921.nc
-atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc
+
atm/cam/topo/mpas_60_nc3000_Co030_Fi001_MulG_PF_Nsw021.nc
-atm/cam/topo/mpas/mpasa60_gmted2010_modis_bedmachine_nc3000_Laplace0050_noleak_20240507.nc
+
atm/cam/topo/mpas_30_nc3000_Co015_Fi001_MulG_PF_Nsw011.nc
-atm/cam/topo/mpas/mpasa30_gmted2010_modis_bedmachine_nc3000_Laplace0025_noleak_20240507.nc
+
atm/cam/topo/mpas_15_nc3500_c20230315.nc
-atm/cam/topo/mpas/mpasa15_gmted2010_modis_bedmachine_nc3000_Laplace0013_noleak_20240507.nc
+
atm/cam/topo/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_20220728.nc
-atm/cam/topo/mpas/mpasa120_gmted2010_modis_bedmachine_nc3000_Laplace0100_noleak_20240507.nc
+
0.0D0