noresm3_0_041_cam6_4_121: Misc. bug fixes and additions

.gitmodules

@@ -85,7 +85,7 @@
 [submodule "oslo_aero"]
     path = src/chemistry/oslo_aero
     url = https://github.com/NorESMhub/OSLO_AERO
-    fxtag = oslo_aero_3_0a012
+    fxtag = oslo_aero_3_0a013
     fxrequired = AlwaysRequired
     fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO.git
 

bld/namelist_files/namelist_defaults_cam.xml

@@ -656,32 +656,32 @@
 <co2_flag co2_cycle="1">.true.</co2_flag>
 
 <!-- Time-variant CO2 fossil fuel emissions -->
-<co2flux_fuel_datafile>atm/cam/ggas/emissions-cmip6_CO2_anthro_surface_175001-201512_fv_0.9x1.25_c20181011.nc</co2flux_fuel_datafile>
-<co2flux_fuel_meshfile>share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</co2flux_fuel_meshfile>
+<co2flux_fuel_datafile>atm/cam/ggas/emissions-cmip7_CO2_anthro_surface_CMIP_CEDS-CMIP-2025-04-18_185001-202312_0.5x0.5_c20250119.nc</co2flux_fuel_datafile>
+<co2flux_fuel_meshfile>share/meshes/0.5x0.5_ESMFmesh_c20260714.nc</co2flux_fuel_meshfile>
 <co2flux_fuel_tintalgo>nearest</co2flux_fuel_tintalgo>
 <co2flux_fuel_year_first sim_year="2000">2000</co2flux_fuel_year_first>
 <co2flux_fuel_year_last  sim_year="2000">2000</co2flux_fuel_year_last>
 <co2flux_fuel_year_align sim_year="2000">1</co2flux_fuel_year_align>
 <co2flux_fuel_year_first sim_year="1850">1850</co2flux_fuel_year_first>
 <co2flux_fuel_year_last  sim_year="1850">1850</co2flux_fuel_year_last>
 <co2flux_fuel_year_align sim_year="1850">1</co2flux_fuel_year_align>
-<co2flux_fuel_year_first sim_year="1850-2015">1850</co2flux_fuel_year_first>
-<co2flux_fuel_year_last  sim_year="1850-2015">2015</co2flux_fuel_year_last>
-<co2flux_fuel_year_align sim_year="1850-2015">1850</co2flux_fuel_year_align>
+<co2flux_fuel_year_first sim_year="1850-2022">1850</co2flux_fuel_year_first>
+<co2flux_fuel_year_last  sim_year="1850-2022">2023</co2flux_fuel_year_last>
+<co2flux_fuel_year_align sim_year="1850-2022">1850</co2flux_fuel_year_align>
 
 <!-- Time-variant CO2 aircraft emissions -->
-<aircraft_co2_datafile>atm/cam/ggas/emissions-cmip6_CO2_anthro_ac_175001-201512_fv_0.9x1.25_c20181011.nc</aircraft_co2_datafile>
-<aircraft_co2_meshfile>share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</aircraft_co2_meshfile>
+<aircraft_co2_datafile>atm/cam/ggas/emissions-cmip7_CO2_anthro_ac_CMIP_CEDS-CMIP-2025-04-18_185001-202312_0.5x0.5_c20250119.nc</aircraft_co2_datafile>
+<aircraft_co2_meshfile>share/meshes/0.5x0.5_ESMFmesh_c20260714.nc</aircraft_co2_meshfile>
 <aircraft_co2_tintalgo>nearest</aircraft_co2_tintalgo>
 <aircraft_co2_year_first  sim_year="2000">2000</aircraft_co2_year_first>
 <aircraft_co2_year_last   sim_year="2000">2000</aircraft_co2_year_last>
 <aircraft_co2_year_align  sim_year="2000">1</aircraft_co2_year_align>
 <aircraft_co2_year_first  sim_year="1850">1850</aircraft_co2_year_first>
 <aircraft_co2_year_last   sim_year="1850">1850</aircraft_co2_year_last>
 <aircraft_co2_year_align  sim_year="1850">1</aircraft_co2_year_align>
-<aircraft_co2_year_first  sim_year="1850-2015">1850</aircraft_co2_year_first>
-<aircraft_co2_year_last   sim_year="1850-2015">2015</aircraft_co2_year_last>
-<aircraft_co2_year_align  sim_year="1850-2015">1850</aircraft_co2_year_align>
+<aircraft_co2_year_first  sim_year="1850-2022">1850</aircraft_co2_year_first>
+<aircraft_co2_year_last   sim_year="1850-2022">2023</aircraft_co2_year_last>
+<aircraft_co2_year_align  sim_year="1850-2022">1850</aircraft_co2_year_align>
 
 <!-- Greenhouse gas production/loss rates -->
 <bndtvg>atm/cam/ggas/noaamisc.r8.nc</bndtvg>
@@ -922,12 +922,6 @@
 
 <!-- Airplane emissions -->
 <airpl_emis_file>atm/cam/chem/trop_mozart/emis/emissions.aircraft.T42LR.nc</airpl_emis_file>
-<no2_aircraft_emis_file>atm/cam/chem/1850-2000_emis/IPCC_emissions_aircraft_NO2_1850-2000_1.9x2.5_c090729.nc</no2_aircraft_emis_file>
-<bc_aircraft_emis_file>atm/cam/chem/1850-2000_emis/IPCC_emissions_aircraft_BC_1850-2000_1.9x2.5.c090729.nc</bc_aircraft_emis_file>
-
-<co_aircraft_emis  >atm/cam/chem/trop_mozart/emis/extfrc.CO.1.9x2.5_c101206.nc</co_aircraft_emis>
-<no_aircraft_emis  >atm/cam/chem/trop_mozart/emis/extfrc.NO.1.9x2.5_c101206.nc</no_aircraft_emis>
-<so2_aircraft_emis >atm/cam/chem/trop_mozart/emis/extfrc.SO2.1.9x2.5_c101206.nc</so2_aircraft_emis>
 
 <!-- Trop chem emissions (default emis files) -->
 <bigalk_emis_file      >atm/cam/chem/emis/1992-2010/emissions.BIGALK.surface.1.9x2.5_c110426.nc</bigalk_emis_file>
@@ -2030,12 +2024,12 @@
 
 <stream_ndep_year_first >2000</stream_ndep_year_first>
 <stream_ndep_year_first sim_year="1850">1850</stream_ndep_year_first>
-<stream_ndep_year_first sim_year="1850-2015">1850</stream_ndep_year_first>
+<stream_ndep_year_first sim_year="1850-2022">1850</stream_ndep_year_first>
 <stream_ndep_year_first sim_year="2010">2010</stream_ndep_year_first>
 
 <stream_ndep_year_last >2000</stream_ndep_year_last>
 <stream_ndep_year_last sim_year="1850">1850</stream_ndep_year_last>
-<stream_ndep_year_last sim_year="1850-2015">2015</stream_ndep_year_last>
+<stream_ndep_year_last sim_year="1850-2022">2022</stream_ndep_year_last>
 <stream_ndep_year_last sim_year="2010">2010</stream_ndep_year_last>
 
 <stream_ndep_year_align >1</stream_ndep_year_align>

bld/namelist_files/namelist_definition.xml

@@ -1106,12 +1106,6 @@ Name of file that contains names of the offline meteorology data files.
 Default: none
 </entry>
 
-<entry id="met_remove_file" type="logical"  category="dyn_fv_off"
-       group="metdata_nl" valid_values="" >
-TRUE =&gt; the offline meteorology file will be removed from local disk when no longer needed.
-Default: FALSE
-</entry>
-
 <entry id="met_rlx_top" type="real"  category="dyn_fv_off"
        group="metdata_nl" valid_values="" >
 (km) top of relaxation region of winds for offline waccm
@@ -10163,7 +10157,7 @@ Default: false
 <entry id="rh_fine_aer_scale_fact_optics" type="real" category="cam_oslo"
        group="oslo_ctl_nl" valid_values="" >
 - Scales the relative humidity in the optical calculations
-  within OSLO_AERO for modes 1-5 
+  within OSLO_AERO for modes 1-5
 - RH not scaled for dust (modes 6-7) or seasalt (modes 8-10)
 Default: 1.0
 </entry>

bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml

@@ -96,7 +96,9 @@
         '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>
+<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>
+<rad_climate co2_cycle="1">'A:Q:H2O','N:O2:O2','A:CO2:CO2','N:ozone:O3','N:N2O:N2O','N:CH4:CH4','N:CFC11:CFC11','N:CFC12:CFC12'</rad_climate>
+
 
 <!--Options for megan -->
 <megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>

bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml → bld/namelist_files/use_cases/1979-2022_camnor_lt_osloaero.xml

@@ -91,15 +91,16 @@
 
 <csw_time_type>SERIAL</csw_time_type>
 
-<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>
-
 <!--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/cmip7_volcaod_v20260105</prescribed_volcaero_datapath>
 <prescribed_volcaero_file>UOEXETER-CMIP-2-2-1_175001-202312_intpwghtavg_v20260105.nc</prescribed_volcaero_file>
 
+<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>
+<rad_climate co2_cycle="1">'A:Q:H2O','N:O2:O2','A:CO2:CO2','N:ozone:O3','N:N2O:N2O','N:CH4:CH4','N:CFC11:CFC11','N:CFC12:CFC12'</rad_climate>
+
 <!-- for prescribed deposition and emission fluxes -->
-<sim_year>1979-2021</sim_year>
+<sim_year>1979-2022</sim_year>
 
 </namelist_defaults>

bld/namelist_files/use_cases/2000_camnor_osloaero.xml

@@ -62,8 +62,6 @@
 <flbc_type>      'CYCLICAL'                          </flbc_type>
 <flbc_cycle_yr>  2000                                </flbc_cycle_yr>
 
-<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>
-
 <prescribed_volcaero_datapath>atm/cam/volc</prescribed_volcaero_datapath>
 <prescribed_volcaero_file>CMIP_CAM6_radiation_average_v3_reformatted.nc</prescribed_volcaero_file>
 <prescribed_volcaero_cycle_yr>1850</prescribed_volcaero_cycle_yr>
@@ -87,6 +85,9 @@
 <cldfrc_iceopt    hgrid="1.9x2.5">4</cldfrc_iceopt>         <!--cldfrc_nl-->
 <do_circulation_diags>.true.</do_circulation_diags>         <!-- only used in fv -->
 
+<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>
+<rad_climate co2_cycle="1">'A:Q:H2O','N:O2:O2','A:CO2:CO2','N:ozone:O3','N:N2O:N2O','N:CH4:CH4','N:CFC11:CFC11','N:CFC12:CFC12'</rad_climate>
+
 <!-- for prescribed deposition and emission fluxes -->
 <sim_year>2000</sim_year>
 

bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml

@@ -15,17 +15,17 @@
 <ubc_file_input_type>'SERIAL'</ubc_file_input_type>
 
 <!-- ozone data -->
-<prescribed_ozone_datapath>   'atm/cam/ozone_strataero'                                                         </prescribed_ozone_datapath>
-<prescribed_ozone_file    >   'ozone_strataero_WACCM_L70_zm5day_18500101-21010201_CMIP6histEnsAvg_SSP245_c190403.nc'       </prescribed_ozone_file>
-<prescribed_ozone_name    >   'O3'                                                                              </prescribed_ozone_name>
-<prescribed_ozone_type    >   SERIAL                                                                            </prescribed_ozone_type>
+<prescribed_ozone_datapath> 'atm/cam/ozone_strataero'                                                                                             </prescribed_ozone_datapath>
+<prescribed_ozone_file    > 'ozone_strataero_b.e30_alpha08o.BHISTC_MTt4s.ne30_t232_wgx3.330_branch_1850_1850_2021_transient_zm_5day_c20260625.nc' </prescribed_ozone_file>
+<prescribed_ozone_name    > 'O3'                                                                                                                  </prescribed_ozone_name>
+<prescribed_ozone_type    > SERIAL                                                                                                                </prescribed_ozone_type>
 
 <!-- Prescribed oxidants for aerosol chemistry -->
-<tracer_cnst_datapath >   'atm/cam/tracer_cnst'                                         </tracer_cnst_datapath>
-<tracer_cnst_file     >   'tracer_cnst_halons_3D_L70_1849-2101_CMIP6ensAvg_SSP2-4.5_c190403.nc'  </tracer_cnst_file>
-<tracer_cnst_specifier>   'O3','OH','NO3','HO2'                                         </tracer_cnst_specifier>
-<tracer_cnst_type     >   INTERP_MISSING_MONTHS                                         </tracer_cnst_type>
-<tracer_cnst_filelist >   ''                                                            </tracer_cnst_filelist>
+<tracer_cnst_datapath >   'atm/cam/tracer_cnst'                                                 </tracer_cnst_datapath>
+<tracer_cnst_file     >   'tracer_cnst_halons_3D_L70_1849-2101_CMIP6ensAvg_SSP2-4.5_c190403.nc' </tracer_cnst_file>
+<tracer_cnst_specifier>   'O3','OH','NO3','HO2'                                                 </tracer_cnst_specifier>
+<tracer_cnst_type     >   INTERP_MISSING_MONTHS                                                 </tracer_cnst_type>
+<tracer_cnst_filelist >   ''                                                                    </tracer_cnst_filelist>
 
 <!-- External forcing -->
 <ext_frc_type>INTERP_MISSING_MONTHS</ext_frc_type>
@@ -91,7 +91,8 @@
 
 <csw_time_type>SERIAL</csw_time_type>
 
-<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>
+<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>
+<rad_climate co2_cycle="1">'A:Q:H2O','N:O2:O2','A:CO2:CO2','N:ozone:O3','N:N2O:N2O','N:CH4:CH4','N:CFC11:CFC11','N:CFC12:CFC12'</rad_climate>
 
 <!--Options for megan -->
 <megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>
@@ -100,6 +101,6 @@
 <prescribed_volcaero_file>UOEXETER-CMIP-2-2-1_175001-202312_intpwghtavg_v20260105.nc</prescribed_volcaero_file>
 
 <!-- for prescribed deposition and emission fluxes -->
-<sim_year>1850-2015</sim_year>
+<sim_year>1850-2022</sim_year>
 
 </namelist_defaults>