diff --git a/bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml b/bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml
index 5c352f3c35..04a535cef0 100644
--- a/bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml
+++ b/bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml
@@ -7,20 +7,20 @@
 <solar_data_type>    FIXED            </solar_data_type>
 
 <!-- LBC Files : -->
-<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
+<flbc_file>atm/waccm/lb/cmip7_ghg_version20260607/ghg_cmip7_CMIP_CR-CMIP-1-0-0_1850_monthly_gnz_0p5degLat_version20260207.nc</flbc_file>
 <flbc_cycle_yr>1850</flbc_cycle_yr>
 <flbc_type>'CYCLICAL'</flbc_type>
 <flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
 
 <!-- Low top upper boundary conditions -->
 <ubc_specifier>'Q:H2O->UBC_FILE'</ubc_specifier>
-<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509cdf5.nc</ubc_file_path>
+<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc</ubc_file_path>
 <ubc_file_input_type>CYCLICAL</ubc_file_input_type>
 <ubc_file_cycle_yr>1850</ubc_file_cycle_yr>
 
 <!-- ozone data :  -->
 <prescribed_ozone_datapath>   'atm/cam/ozone_strataero'  </prescribed_ozone_datapath>
-<prescribed_ozone_file    >   'ozone_strataero_cyclical_WACCM6_L70_CMIP6-piControl.001_y21-50avg_zm_5day_c180802.nc'       </prescribed_ozone_file>
+<prescribed_ozone_file    >   'ozone_strataero_b.e30_alpha07c_cesm.B1850C_MTt4s.ne30_t232_wgx3.251.001_1850climo_zm_5day_c251204.nc'       </prescribed_ozone_file>
 <prescribed_ozone_name    >   'O3'  </prescribed_ozone_name>
 <prescribed_ozone_type    >   CYCLICAL   </prescribed_ozone_type>
 <prescribed_ozone_cycle_yr>   1850    </prescribed_ozone_cycle_yr>
@@ -28,7 +28,7 @@
 <!-- Prescribed oxidants for aerosol chemistry : -->
 <tracer_cnst_cycle_yr >   1850    </tracer_cnst_cycle_yr>
 <tracer_cnst_datapath >   'atm/cam/tracer_cnst'   </tracer_cnst_datapath>
-<tracer_cnst_file     >   'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' </tracer_cnst_file>
+<tracer_cnst_file     >   'tracer_cnst_MTt4s_halons_3Dmonthly_1850climo251_c20251209.nc' </tracer_cnst_file>
 <tracer_cnst_specifier>   'O3','OH','NO3','HO2','HALONS' </tracer_cnst_specifier>
 <tracer_cnst_type     >   'CYCLICAL'  </tracer_cnst_type>
 <tracer_cnst_filelist >   ''   </tracer_cnst_filelist>
@@ -36,34 +36,61 @@
 <!-- External forcing -->
 <ext_frc_type>CYCLICAL</ext_frc_type>
 <ext_frc_cycle_yr>1850</ext_frc_cycle_yr>
-<ext_frc_specifier>
-  'BC_AX  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_AX_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_AX  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_AX_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_N   ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_N_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_N   ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_N_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_NI_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_volcCONTEXPL_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_volcCONTEXPL_vertical_1850_0.9x1.25_version20180512.nc'
+<ext_frc_specifier hgrid="ne16np4" npg="3">
+	'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  2.6*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne16pg3_AeroCom2006_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne16pg3_AeroCom2006_version20260209.nc'
+</ext_frc_specifier>
+
+<ext_frc_specifier hgrid="ne30np4" npg="3">
+	'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  2.6*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne30pg3_AeroCom2006_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne30pg3_AeroCom2006_version20260209.nc'
 </ext_frc_specifier>
 
 <!-- Surface emissions -->
 <srf_emis_type>CYCLICAL</srf_emis_type>
 <srf_emis_cycle_yr>1850</srf_emis_cycle_yr>
-<srf_emis_specifier>
-  'BC_AX  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_AX_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'BC_N   ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_N_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc'
+<srf_emis_specifier hgrid="ne16np4" npg="3">
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc'
+</srf_emis_specifier>
+
+<srf_emis_specifier hgrid="ne30np4" npg="3">
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc'
 </srf_emis_specifier>
 
 <rad_climate>'A:Q:H2O','N:O2:O2','A:CO2:CO2','N:ozone:O3','A:N2O:N2O','A:CH4:CH4','N:CFC11STAR:CFC11','A:CFC12:CFC12'</rad_climate>
@@ -71,8 +98,8 @@
 <!--Options for megan -->
 <megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>
 
-<prescribed_volcaero_datapath>atm/cam/volc</prescribed_volcaero_datapath>
-<prescribed_volcaero_file>CMIP_CAM6_radiation_average_v3_reformatted.nc</prescribed_volcaero_file>
+<prescribed_volcaero_datapath>atm/cam/volc/cmip7_volcaod_v20260105</prescribed_volcaero_datapath>
+<prescribed_volcaero_file>UOEXETER-CMIP-2-2-1_185001-202112-clim_intpwghtavg_v20260105.nc</prescribed_volcaero_file>
 <prescribed_volcaero_cycle_yr>1850</prescribed_volcaero_cycle_yr>
 <prescribed_volcaero_type>CYCLICAL</prescribed_volcaero_type>
 
@@ -80,24 +107,6 @@
 <dust_emis_fact> 4.60D0  </dust_emis_fact>                   <!--dust_nl-->
 <dust_emis_method>Leung_2023</dust_emis_method>              <!--dust_emi-->
 
-<!-- ================================================= -->
-<!-- noresm-physics -->
-<!-- ================================================= -->
-
-<dme_energy_adjust>.true.</dme_energy_adjust>
-<zmconv_c0_lnd> 0.0200D0 </zmconv_c0_lnd>                   <!--zmconv_nl-->
-<zmconv_c0_ocn> 0.0200D0 </zmconv_c0_ocn>                   <!--zmconv_nl-->
-<zmconv_ke>     8.0E-6 </zmconv_ke>                         <!--zmconv_nl-->
-<zmconv_ke_lnd> 8.0E-6 </zmconv_ke_lnd>                     <!--zmconv_nl-->
-<tau_0_ubc>  .true.   </tau_0_ubc>                          <!--gw_drag_nl-->
-<clubb_gamma_coef hgrid="0.9x1.25">0.286</clubb_gamma_coef>
-<clubb_gamma_coef hgrid="1.9x2.5" >0.264</clubb_gamma_coef>
-<micro_mg_dcs     hgrid="0.9x1.25">5.5e-4</micro_mg_dcs>    <!--micro_mg_nl-->
-<micro_mg_dcs     hgrid="1.9x2.5" >5.0e-4</micro_mg_dcs>    <!--micro_mg_nl-->
-<cldfrc2m_rhmini  hgrid="0.9x1.25">0.90D0</cldfrc2m_rhmini> <!--cldfrc2m_nl-->
-<cldfrc_iceopt    hgrid="1.9x2.5"> 4 </cldfrc_iceopt>       <!--cldfrc_nl-->
-<do_circulation_diags> .true. </do_circulation_diags>       <!-- only used in fv -->
-
 <!-- for prescribed deposition and emission fluxes -->
 <sim_year>1850</sim_year>
 
diff --git a/bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml b/bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml
index c414bb45d2..4b91963fc7 100644
--- a/bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml
+++ b/bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml
@@ -7,20 +7,20 @@
 <solar_data_type>    FIXED            </solar_data_type>
 
 <!-- LBC Files : -->
-<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
+<flbc_file>atm/waccm/lb/cmip7_ghg_version20260607/ghg_cmip7_CMIP_CR-CMIP-1-0-0_1850_monthly_gnz_0p5degLat_version20260207.nc</flbc_file>
 <flbc_cycle_yr>1850</flbc_cycle_yr>
 <flbc_type>'CYCLICAL'</flbc_type>
 <flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
 
 <!-- Low top upper boundary conditions -->
 <ubc_specifier>'Q:H2O->UBC_FILE'</ubc_specifier>
-<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.185001-201412_c230509cdf5.nc</ubc_file_path>
+<ubc_file_path>atm/cam/chem/ubc/b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensAvg123.cam.h0zm.H2O.1849-2014_c240604.nc</ubc_file_path>
 <ubc_file_input_type>CYCLICAL</ubc_file_input_type>
 <ubc_file_cycle_yr>1850</ubc_file_cycle_yr>
 
 <!-- ozone data :  -->
 <prescribed_ozone_datapath>   'atm/cam/ozone_strataero'  </prescribed_ozone_datapath>
-<prescribed_ozone_file    >   'ozone_strataero_cyclical_WACCM6_L70_CMIP6-piControl.001_y21-50avg_zm_5day_c180802.nc'       </prescribed_ozone_file>
+<prescribed_ozone_file    >   'ozone_strataero_b.e30_alpha07c_cesm.B1850C_MTt4s.ne30_t232_wgx3.251.001_1850climo_zm_5day_c251204.nc'       </prescribed_ozone_file>
 <prescribed_ozone_name    >   'O3'  </prescribed_ozone_name>
 <prescribed_ozone_type    >   CYCLICAL   </prescribed_ozone_type>
 <prescribed_ozone_cycle_yr>   1850    </prescribed_ozone_cycle_yr>
@@ -28,7 +28,7 @@
 <!-- Prescribed oxidants for aerosol chemistry : -->
 <tracer_cnst_cycle_yr >   1850    </tracer_cnst_cycle_yr>
 <tracer_cnst_datapath >   'atm/cam/tracer_cnst'   </tracer_cnst_datapath>
-<tracer_cnst_file     >   'tracer_cnst_WACCM6_halons_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc' </tracer_cnst_file>
+<tracer_cnst_file     >   'tracer_cnst_MTt4s_halons_3Dmonthly_1850climo251_c20251209.nc' </tracer_cnst_file>
 <tracer_cnst_specifier>   'O3','OH','NO3','HO2' </tracer_cnst_specifier>
 <tracer_cnst_type     >   'CYCLICAL'  </tracer_cnst_type>
 <tracer_cnst_filelist >   ''   </tracer_cnst_filelist>
@@ -36,35 +36,64 @@
 <!-- External forcing -->
 <ext_frc_type>CYCLICAL</ext_frc_type>
 <ext_frc_cycle_yr>1850</ext_frc_cycle_yr>
-<ext_frc_specifier>
-  'H2O    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/elev/H2O_emission_CH4_oxidationx2_elev_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc',
-  'BC_AX  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_AX_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_AX  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_AX_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_N   ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_N_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_N   ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_N_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'BC_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_NI_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_volcCONTEXPL_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_airALL_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_anthroprofENEIND_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_bbAGRIBORFDEFOPEATSAVATEMF_vertical_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_volcCONTEXPL_vertical_1850_0.9x1.25_version20180512.nc'
+<ext_frc_specifier hgrid="ne16np4" npg="3">
+	'H2O    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/elev/H2O_emission_CH4_oxidationx2_elev_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc',
+	'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  2.6*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne16pg3_AeroCom2006_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne16pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne16pg3_AeroCom2006_version20260209.nc'
+</ext_frc_specifier>
+
+<ext_frc_specifier hgrid="ne30np4" npg="3">
+	'H2O    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/elev/H2O_emission_CH4_oxidationx2_elev_3DmonthlyL70_1850climoCMIP6piControl001_y21-50avg_c180802.nc',
+	'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  2.6*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne30pg3_AeroCom2006_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_airALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthroprofALL_vertical_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_bbALL_vertical_1850_ne30pg3_DRES-CMIP-BB4CMIP7-2-0_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_volcALL_vertical_1850_ne30pg3_AeroCom2006_version20260209.nc'
 </ext_frc_specifier>
 
 <!-- Surface emissions -->
 <srf_emis_type>CYCLICAL</srf_emis_type>
 <srf_emis_cycle_yr>1850</srf_emis_cycle_yr>
-<srf_emis_specifier>
-  'BC_AX  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_AX_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'BC_N   ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_BC_N_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'OM_NI  ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_OM_NI_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'SO2    ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO2_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc',
-  'SO4_PR ->  $INPUTDATA_ROOT/atm/cam/chem/emis/cmip6_emissions_version20180512/emissions_cmip6_noresm2_SO4_PR_anthrosurfAGRTRADOMSOLWSTSHP_surface_1850_0.9x1.25_version20180512.nc'
+
+<srf_emis_specifier hgrid="ne16np4" npg="3">
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_OC_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne16pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne16pg3_CEDS-CMIP-2025-04-18_version20260209.nc'
+</srf_emis_specifier>
+
+<srf_emis_specifier hgrid="ne30np4" npg="3">
+        'BC_AX  ->  0.1*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'BC_N   ->  0.9*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_BC_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'OM_NI  ->  1.4*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_OC_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO2    ->  0.975*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc',
+        'SO4_PR ->  0.025*$INPUTDATA_ROOT/atm/cam/chem/emis/cmip7_emissions_version20260209/ne30pg3/emissions_cmip7_noresm3_S_anthrosurfALL_surface_1850_ne30pg3_CEDS-CMIP-2025-04-18_version20260209.nc'
 </srf_emis_specifier>
 
 <rad_climate>'A:Q:H2O','N:O2:O2','N:CO2:CO2','N:ozone:O3','N:N2O:N2O','N:CH4:CH4','N:CFC11:CFC11','N:CFC12:CFC12'</rad_climate>
@@ -72,8 +101,8 @@
 <!--Options for megan -->
 <megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>
 
-<prescribed_volcaero_datapath>atm/cam/volc</prescribed_volcaero_datapath>
-<prescribed_volcaero_file>CMIP_CAM6_radiation_average_v3_reformatted.nc</prescribed_volcaero_file>
+<prescribed_volcaero_datapath>atm/cam/volc/cmip7_volcaod_v20260105</prescribed_volcaero_datapath>
+<prescribed_volcaero_file>UOEXETER-CMIP-2-2-1_185001-202112-clim_intpwghtavg_v20260105.nc</prescribed_volcaero_file>
 <prescribed_volcaero_cycle_yr>1850</prescribed_volcaero_cycle_yr>
 <prescribed_volcaero_type>CYCLICAL</prescribed_volcaero_type>
 
@@ -81,24 +110,6 @@
 <dust_emis_fact> 4.60D0  </dust_emis_fact>                   <!--dust_nl-->
 <dust_emis_method>Leung_2023</dust_emis_method>              <!--dust_emi-->
 
-<!-- ================================================= -->
-<!-- noresm-physics -->
-<!-- ================================================= -->
-
-<dme_energy_adjust>.true.</dme_energy_adjust>
-<zmconv_c0_lnd> 0.0200D0 </zmconv_c0_lnd>                   <!--zmconv_nl-->
-<zmconv_c0_ocn> 0.0200D0 </zmconv_c0_ocn>                   <!--zmconv_nl-->
-<zmconv_ke>     8.0E-6 </zmconv_ke>                         <!--zmconv_nl-->
-<zmconv_ke_lnd> 8.0E-6 </zmconv_ke_lnd>                     <!--zmconv_nl-->
-<tau_0_ubc>  .true.   </tau_0_ubc>                          <!--gw_drag_nl-->
-<clubb_gamma_coef hgrid="0.9x1.25">0.286</clubb_gamma_coef>
-<clubb_gamma_coef hgrid="1.9x2.5" >0.264</clubb_gamma_coef>
-<micro_mg_dcs     hgrid="0.9x1.25">5.5e-4</micro_mg_dcs>    <!--micro_mg_nl-->
-<micro_mg_dcs     hgrid="1.9x2.5" >5.0e-4</micro_mg_dcs>    <!--micro_mg_nl-->
-<cldfrc2m_rhmini  hgrid="0.9x1.25">0.90D0</cldfrc2m_rhmini> <!--cldfrc2m_nl-->
-<cldfrc_iceopt    hgrid="1.9x2.5"> 4 </cldfrc_iceopt>       <!--cldfrc_nl-->
-<do_circulation_diags> .true. </do_circulation_diags>       <!-- only used in fv -->
-
 <!-- for prescribed deposition and emission fluxes -->
 <sim_year>1850</sim_year>
 
diff --git a/bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml b/bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml
index 2299ecf6e2..63e13d2693 100644
--- a/bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml
+++ b/bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <namelist_defaults>
-<start_ymd>19790101</start_ymd>
 
 <!-- Solar data from NRL -->
-<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc</solar_irrad_data_file>
+<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
 
 <!-- LBC Files -->
-<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
+<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
 <flbc_type>'SERIAL'</flbc_type>
 <flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
 
@@ -70,28 +69,6 @@
 <prescribed_volcaero_datapath>atm/cam/volc</prescribed_volcaero_datapath>
 <prescribed_volcaero_file>CMIP_CAM6_radiation_v3_reformatted.nc</prescribed_volcaero_file>
 
-<!--Options for mineral dust -->
-<dust_emis_fact> 4.60D0  </dust_emis_fact>                   <!--dust_nl-->
-<dust_emis_method>Leung_2023</dust_emis_method>              <!--dust_emi-->
-
-<!-- ================================================= -->
-<!-- noresm-physics -->
-<!-- ================================================= -->
-
-<dme_energy_adjust>.true.</dme_energy_adjust>
-<zmconv_c0_lnd> 0.0200D0 </zmconv_c0_lnd>                   <!--zmconv_nl-->
-<zmconv_c0_ocn> 0.0200D0 </zmconv_c0_ocn>                   <!--zmconv_nl-->
-<zmconv_ke>     8.0E-6 </zmconv_ke>                         <!--zmconv_nl-->
-<zmconv_ke_lnd> 8.0E-6 </zmconv_ke_lnd>                     <!--zmconv_nl-->
-<tau_0_ubc>  .true.   </tau_0_ubc>                          <!--gw_drag_nl-->
-<clubb_gamma_coef hgrid="0.9x1.25">0.286</clubb_gamma_coef>
-<clubb_gamma_coef hgrid="1.9x2.5" >0.264</clubb_gamma_coef>
-<micro_mg_dcs     hgrid="0.9x1.25">5.5e-4</micro_mg_dcs>    <!--micro_mg_nl-->
-<micro_mg_dcs     hgrid="1.9x2.5" >5.0e-4</micro_mg_dcs>    <!--micro_mg_nl-->
-<cldfrc2m_rhmini  hgrid="0.9x1.25">0.90D0</cldfrc2m_rhmini> <!--cldfrc2m_nl-->
-<cldfrc_iceopt    hgrid="1.9x2.5"> 4 </cldfrc_iceopt>       <!--cldfrc_nl-->
-<do_circulation_diags> .true. </do_circulation_diags>       <!-- only used in fv -->
-
 <!-- for prescribed deposition and emission fluxes -->
 <sim_year>1850-2015</sim_year>
 
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index e2feafc1c0..2216ebcfb5 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -48,6 +48,7 @@
     <alias>NF2000</alias>
     <lname>2000_CAM70%LT%NORESM%CAMoslo_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
+
   <compset>
     <alias>NF2000mam4</alias>
     <lname>2000_CAM70%LT%NORESM%GHGMAM4_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV</lname>
@@ -57,22 +58,27 @@
     <alias>NF1850</alias>
     <lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
+
   <compset>
     <alias>NF1850mam4</alias>
     <lname>1850_CAM70%LT%NORESM%GHGMAM4_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
+
   <compset>
     <alias>NF1850fates-sp</alias>
     <lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
   </compset>
+
   <compset>
     <alias>NF1850fates-nocomp</alias>
     <lname>1850_CAM70%LT%NORESM%CAMoslo_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
   </compset>
+
   <compset>
     <alias>NF1850ghg_fates-sp</alias>
     <lname>1850_CAM70%LT%NORESM%GHGCAMoslo_CLM60%FATES-SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
   </compset>
+
   <compset>
     <alias>NF1850ghg_fates-nocomp</alias>
     <lname>1850_CAM70%LT%NORESM%GHGCAMoslo_CLM60%FATES-NOCOMP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV_SESP</lname>
@@ -82,6 +88,7 @@
     <alias>NFLTHIST</alias>
     <lname>HIST_CAM70%LT%NORESM%CAMoslo_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
+
   <compset>
     <alias>NFLTHISTmam4</alias>
     <lname>HIST_CAM70%LT%NORESM%GHGMAM4_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_DGLC%NOEVOLVE_SWAV</lname>
@@ -91,57 +98,10 @@
   <!-- CAM compsets -->
   <!-- ******************************** -->
 
-  <!-- ****************************** -->
-  <!-- CAM nuopc testing -->
-  <!-- ****************************** -->
-
-  <compset>
-    <alias>F2000Nuopc</alias>
-    <lname>2000_CAM40_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
-  </compset>
-
   <!-- ****************************** -->
   <!-- NCAR CAM compsets              -->
   <!-- ****************************** -->
 
-  <compset>
-    <alias>F2000climo</alias>
-    <lname>2000_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FHIST</alias>
-    <lname>HIST_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FLTHIST</alias>
-    <lname>HIST_CAM70%LT_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FMTHIST</alias>
-    <lname>HIST_CAM70%MT_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>F1850C_LTso</alias>
-    <lname>1850_CAM70%LT_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>F1850C_MTso</alias>
-    <lname>1850_CAM70%MT_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FHIST_BGC</alias>
-    <lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-<!--    <science_support grid="f09_f09_mg17"/> -->
-  </compset>
-
   <!-- CAM simpler model compsets -->
 
   <compset>
@@ -362,25 +322,7 @@
   <!-- CAM tested compsets -->
   <!-- ****************************** -->
 
-  <compset>
-    <alias>F2010climo</alias>
-    <lname>2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>F1850</alias>
-    <lname>1850_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FHIST_BDRD</alias>
-    <lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_BGC%BDRD</lname>
-  </compset>
-
-  <compset>
-    <alias>F2000dev</alias>
-    <lname>2000_CAM70_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
+  <!-- None currently -->
 
   <!-- PORT compsets -->
   <compset>
@@ -398,321 +340,6 @@
     <lname>2000_CAM60%PORT_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
   </compset>
 
-  <!-- ****************************** -->
-  <!-- CAM untested compsets -->
-  <!-- ****************************** -->
-
-  <!-- cam-chem untested compsets -->
-
-  <compset>
-    <alias>FC2000climo</alias>
-    <lname>2000_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FC2000climo_HCO</alias>
-    <lname>2000_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FC2000climo_GC</alias>
-    <lname>2000_CAM60%GEOSCHEM%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FCARMA2000climo</alias>
-    <lname>2000_CAM60%CARMATS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>QPCARMATS</alias>
-    <lname>2000_CAM60%CARMATS_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>QPCARMAWM</alias>
-    <lname>2000_CAM60%CARMAWM_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FCARMAHIST</alias>
-    <lname>HIST_CAM60%CARMATS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCARMAnudged</alias>
-    <lname>HIST_CAM60%CARMATS%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCARMASD</alias>
-    <lname>HIST_CAM60%CARMATS%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FWmaCARMAHIST</alias>
-    <lname>HIST_CAM60%CARMAWM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FWmaCARMAnudged</alias>
-    <lname>HIST_CAM60%CARMAWM%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FC2010climo</alias>
-    <lname>2010_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FC2010climo_HCO</alias>
-    <lname>2010_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FC2010climo_GC</alias>
-    <lname>2010_CAM60%GEOSCHEM%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FCHIST</alias>
-    <lname>HIST_CAM60%CT1S_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FHISTC_LTt1s</alias>
-    <lname>HISTC_CAM70%LT%CT1S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_MTt1s</alias>
-    <lname>HISTC_CAM70%MT%CT1S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_MTt4s</alias>
-    <lname>HISTC_CAM70%MT%CT4S_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_WAsc</alias>
-    <lname>HISTC_CAM70%WA%CSO_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_WAma</alias>
-    <lname>HISTC_CAM70%WA%CT0MA_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_WAt1ma</alias>
-    <lname>HISTC_CAM70%WA%CT1MA_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_WAt4ma</alias>
-    <lname>HISTC_CAM70%WA%CT4MA_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FHISTC_WXma</alias>
-    <lname>HISTC_CAM70%WX%CT0MA_CLM60%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCvbsxHIST</alias>
-    <lname>HIST_CAM60%CVBSX_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCfireHIST</alias>
-    <lname>HIST_CAM60%CFIRE_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCHIST_HCO</alias>
-    <lname>HIST_CAM60%CT1S%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FCnudged</alias>
-    <lname>HIST_CAM60%CT1S%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-    <compset>
-    <alias>FCnudged_GC</alias>
-    <lname>HIST_CAM60%GEOSCHEM%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FCts2nudged</alias>
-    <lname>HIST_CAM60%CT2S%NUDG_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCnudged_HCO</alias>
-    <lname>HIST_CAM60%CT1S%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCts2nudged_HCO</alias>
-    <lname>HIST_CAM60%CT2S%NUDG%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FCSD</alias>
-    <lname>HIST_CAM60%CT1S%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCts2SD</alias>
-    <lname>HIST_CAM60%CT2S%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FCSD_HCO</alias>
-    <lname>HIST_CAM60%CT1S%SDYN%HEMCO_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FSD</alias>
-    <lname>HIST_CAM60%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FMOZ</alias>
-    <lname>2000_CAM40%TMOZ_CLM45%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>F1850_BDRD</alias>
-    <lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_BGC%BDRD</lname>
-  </compset>
-
-  <compset>
-    <alias>FHIST_DARTC6</alias>
-    <lname>HIST_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FGRAYRAD</alias>
-    <lname>2000_CAM%GRAYRAD_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
-  </compset>
-
-  <!-- ****************************** -->
-  <!-- WACCM science supported compsets -->
-  <!-- ****************************** -->
-
-  <compset>
-    <alias>FWHIST</alias>
-    <lname>HIST_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FWHIST_BGC</alias>
-    <lname>HIST_CAM60%WCTS_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FWsc2010climo</alias>
-    <lname>2010_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FWsc2000climo</alias>
-    <lname>2000_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FWsc1850</alias>
-    <lname>1850_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FWscHIST</alias>
-    <lname>HIST_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <compset>
-    <alias>FW1850</alias>
-    <lname>1850_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-    <science_support grid="f09_f09_mg17"/>
-  </compset>
-
-  <!-- ****************************** -->
-  <!-- WACCM tested compsets -->
-  <!-- ****************************** -->
-
-  <compset>
-    <alias>FWma2000climo</alias>
-    <lname>2000_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FW2000climo</alias>
-    <lname>2000_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FW2010climo</alias>
-    <lname>2010_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FWSD</alias>
-    <lname>HIST_CAM60%WCTS%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FW4ma2000</alias>
-    <lname>2000_CAM40%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-  </compset>
-
-  <!-- ****************************** -->
-  <!-- WACCM untested compsets -->
-  <!-- ****************************** -->
-
-  <compset>
-    <alias>FWmaHIST</alias>
-    <lname>HIST_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FWmaSD</alias>
-    <lname>HIST_CAM60%WCCM%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FWmadHIST</alias>
-    <lname>HIST_CAM60%WCMD_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FWmadSD</alias>
-    <lname>HIST_CAM60%WCMD%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FW4madHIST</alias>
-    <lname>HIST_CAM40%WCMD_CLM50%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-  </compset>
-  <compset>
-    <alias>FW4madSD</alias>
-    <lname>HIST_CAM40%WCMD%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
-  </compset>
-
-  <!-- ****************************** -->
-  <!-- WACCM-X tested compsets -->
-  <!-- ****************************** -->
-
-  <compset>
-    <alias>FX2000</alias>
-    <lname>2000_CAM60%WXIE_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FXHIST</alias>
-    <lname>HIST_CAM60%WXIE_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FXmadHIST</alias>
-    <lname>HIST_CAM60%WXIED_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FXSD</alias>
-    <lname>HIST_CAM60%WXIE%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
-  <compset>
-    <alias>FXmadSD</alias>
-    <lname>HIST_CAM60%WXIED%SDYN_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
-  </compset>
-
   <!-- ENTRIES -->
 
   <entries>
@@ -809,19 +436,6 @@
       </values>
     </entry>
 
-    <!-- Overrides for WACCMX -->
-    <entry id="ATM_NCPL">
-      <values match="first">
-        <value compset="_CAM\d0%WX">288</value>
-      </values>
-    </entry>
-
-    <entry id="USE_ESMF_LIB">
-      <values match="first">
-        <value compset="_CAM\d0%WXIE">TRUE</value>
-      </values>
-    </entry>
-
     <!-- Overrides -->
     <entry id="CALENDAR">
       <values match="first">
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index fb787a79b4..cda5e6b421 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -4,16 +4,6 @@
 <!--              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@             -->
 <!--              CAM-Nor test-supported COMPSETS             -->
 <!--              @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@             -->
-
-  <test compset="NFLTHISTmam4" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s">
-    <machines>
-      <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
-      <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:40:00</option>
-    </options>
-  </test>
   <test compset="NFLTHIST" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
@@ -21,47 +11,32 @@
     </machines>
     <options>
       <option name="wallclock">00:40:00</option>
+      <option name="comment">Test HIST compset at 1 degree</option>
     </options>
   </test>
 
-  <test compset="NF2000" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
-    <machines>
-      <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
-      <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:40:00</option>
-    </options>
-  </test>
-  <test compset="NF2000mam4" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
+  <test compset="NFLTHISTmam4" grid="ne16pg3_ne16pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
       <option name="wallclock">00:40:00</option>
+      <option name="comment">Test HIST compset with MAM4 chemistry</option>
     </options>
   </test>
 
-  <test compset="NF1850fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
+  <test compset="NF2000" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
-      <option name="wallclock">00:20:00</option>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">Test 2000 compset at 1 degree</option>
     </options>
   </test>
 
-  <test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
-    <machines>
-      <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
-      <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-    </options>
-  </test>
   <test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s_aero_history">
     <machines>
       <machine name="betzy"  compiler="gnu" category="aux_cam_noresm"/>
@@ -69,17 +44,21 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
+      <option name="comment">Test basic 1850 at 1 degree with GNU compiler</option>
     </options>
   </test>
-  <test compset="NF1850mam4" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
+
+  <test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
+      <option name="comment">Test base 1850 at 1 degree without DEBUG</option>
     </options>
   </test>
+
   <test compset="NF1850" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/secice">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
@@ -87,9 +66,10 @@
     </machines>
     <options>
       <option name="wallclock">00:20:00</option>
-      <option name="comment">Test of secondary ice microphysics</option>
+      <option name="comment">Test of secondary ice microphysics, without DEBUG</option>
     </options>
   </test>
+
   <test compset="NF1850" grid="ne16pg3_ne16pg3_mtn14" name="ERP_D_Ln18_P256" testmods="cam/outfrq9s_zm">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
@@ -100,77 +80,58 @@
       <option name="comment">Test ZM modifications from Tomas Tonazzio</option>
     </options>
   </test>
-  <test compset="NF1850ghg_fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
+
+  <test compset="NF1850fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
-      <option name="wallclock">00:40:00</option>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">Test 1850 with FATES SP at 2 degrees without DEBUG</option>
     </options>
   </test>
-  <test compset="NF1850ghg_fates-nocomp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ld5" testmods="cam/outfrq9s">
+
+  <test compset="NF1850ghg_fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
       <option name="wallclock">00:40:00</option>
+      <option name="comment">Test of 1850 at 2 degrees with FATES SP and DEBUG</option>
     </options>
   </test>
 
-  <test compset="NF1850fates-nocomp" grid="ne30pg3_ne30pg3_mtn14" name="ERS_Ld3" testmods="cam/outfrq9s_fatesini">
+  <test compset="NF1850fates-nocomp" grid="ne30pg3_ne30pg3_mtn14" name="ERS_D_Ld3" testmods="cam/outfrq9s_fatesini">
     <machines>
       <machine name="betzy"  compiler="gnu" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="gnu" category="aux_cam_noresm"/>
     </machines>
     <options>
       <option name="wallclock">01:40:00</option>
+      <option name="comment">Test of 1 degree FATES NOCOMP with GNU compiler</option>
     </options>
   </test>
-
-  <test compset="NF1850" grid="ne3pg3_ne3pg3_mtn14" name="ERP_D_Ln9" testmods="cam/outfrq9s">
-    <machines>
-      <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
-      <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-    </options>
-  </test>
-
-<!--              @@@@@@@@@@@@@@@@@@@@@@@@@@@                 -->
-<!--              CAM test-supported COMPSETS                 -->
-<!--              @@@@@@@@@@@@@@@@@@@@@@@@@@@                 -->
-
-  <test compset="F1850" grid="f19_f19_mtn14" name="ERP_D_Ln9_P256" testmods="cam/outfrq9s">
-    <machines>
-      <machine name="betzy"  compiler="intel" category="prealpha_noresm"/>
-      <machine name="olivia" compiler="intel" category="prealpha_noresm"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-    </options>
-  </test>
-
-  <test compset="F2000climo" grid="ne30pg3_ne30pg3_mtn14" name="ERP_D_Ln9_P512" testmods="cam/outfrq9s">
+  <test compset="NF1850ghg_fates-nocomp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ld5" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
-      <option name="wallclock">00:25:00</option>
+      <option name="wallclock">00:40:00</option>
+      <option name="comment">Test of 2 degree FATES NOCOMP without DEBUG</option>
     </options>
   </test>
 
-  <test compset="FLTHIST" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9_P36" testmods="cam/outfrq9s">
+  <test compset="NF1850mam4" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy"  compiler="intel" category="aux_cam_noresm"/>
       <machine name="olivia" compiler="intel" category="aux_cam_noresm"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
-      <option name="comment">CAM7 low top ~40 km</option>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment">Test of 1850 compset at 1 degree with MAM chemistry</option>
     </options>
   </test>
 
diff --git a/src/physics/cam/co2_cycle.F90 b/src/physics/cam/co2_cycle.F90
index cffbc5618d..1308cbb904 100644
--- a/src/physics/cam/co2_cycle.F90
+++ b/src/physics/cam/co2_cycle.F90
@@ -277,7 +277,8 @@ subroutine co2_init
       end do
 
       ! Find and store the aircraft CO2 index
-      idx_ac_CO2 = pbuf_get_index('ac_CO2')
+      ! We can ignore the error code, idx_ac_CO2 is unchanged on error
+      idx_ac_CO2 = pbuf_get_index('ac_CO2', errcode=mm)
 
    end subroutine co2_init