From 35cc72d848e64bebdb7cc1eeedefedb06c5f683c Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <stevenng@met.no>
Date: Tue, 7 Jul 2026 15:39:55 +0200
Subject: [PATCH] - Remove rad_climate from use cases.   - Allow build_namelist
 to compute this - Update sim_year to 2022 for cases with extended forcing
 files - Update Oslo Aero tag with some additions and bug fixes

---
 .gitmodules                                                   | 2 +-
 bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml   | 2 --
 bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml      | 2 --
 bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml | 4 +---
 bld/namelist_files/use_cases/2000_camnor_osloaero.xml         | 2 --
 bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml      | 4 +---
 src/chemistry/oslo_aero                                       | 2 +-
 7 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index cd3c552577..173d8fccdb 100644
--- a/.gitmodules
+++ b/.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
 
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 1ede99a567..f5a6e1da1b 100644
--- a/bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml
+++ b/bld/namelist_files/use_cases/1850_camnor_lt_ghgosloaero.xml
@@ -93,8 +93,6 @@
         '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>
-
 <!--Options for megan -->
 <megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>
 
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 f3b8f4ad7b..4d53344105 100644
--- a/bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml
+++ b/bld/namelist_files/use_cases/1850_camnor_lt_osloaero.xml
@@ -96,8 +96,6 @@
         '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>
-
 <!--Options for megan -->
 <megan_specifier>'isoprene = isoprene','monoterp = myrcene + sabinene + limonene+ carene_3 + ocimene_t_b + pinene_b + pinene_a'</megan_specifier>
 
diff --git a/bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml b/bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml
index 485447bbe2..3ab33092bb 100644
--- a/bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml
+++ b/bld/namelist_files/use_cases/1979-2021_camnor_lt_osloaero.xml
@@ -91,8 +91,6 @@
 
 <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>
 
@@ -100,6 +98,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>1979-2021</sim_year>
+<sim_year>1979-2022</sim_year>
 
 </namelist_defaults>
diff --git a/bld/namelist_files/use_cases/2000_camnor_osloaero.xml b/bld/namelist_files/use_cases/2000_camnor_osloaero.xml
index 3c7fc7f07f..428ec79fff 100644
--- a/bld/namelist_files/use_cases/2000_camnor_osloaero.xml
+++ b/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>
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 11822abecb..4cf0473493 100644
--- a/bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml
+++ b/bld/namelist_files/use_cases/hist_camnor_lt_osloaero.xml
@@ -91,8 +91,6 @@
 
 <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>
 
@@ -100,6 +98,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>
diff --git a/src/chemistry/oslo_aero b/src/chemistry/oslo_aero
index 34d7fab916..7a1553626b 160000
--- a/src/chemistry/oslo_aero
+++ b/src/chemistry/oslo_aero
@@ -1 +1 @@
-Subproject commit 34d7fab9160bc0da74d28cbfd60d699426f29ee7
+Subproject commit 7a1553626b395128aa83b94c591f9ecab666836c