From e8ac6d4531bb5d77f2bf276693d1053cd3931710 Mon Sep 17 00:00:00 2001
From: Meng Huang <57012216+meng630@users.noreply.github.com>
Date: Tue, 26 Aug 2025 11:03:28 -0400
Subject: [PATCH 1/5] Update linoz and oxid files in XML
Replace the multi-year linoz and oxid files with single-year to fix NBFB restart in MAM4xx
---
components/eamxx/cime_config/namelist_defaults_eamxx.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/components/eamxx/cime_config/namelist_defaults_eamxx.xml b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
index 3b0f4307bb48..d87aff6cd355 100644
--- a/components/eamxx/cime_config/namelist_defaults_eamxx.xml
+++ b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
@@ -317,12 +317,12 @@ be lost if SCREAM_HACK_XML is not enabled.
4
193.0
20100101
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne30pg2_c20240724.nc
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne4pg2_c20240724.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne30pg2_c20250815.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250815.nc
20150101
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_1850-2015_ne30pg2_c20241009.nc
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_1850-2015_ne4pg2_c20241009.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_2015_ne30pg2_c20250813.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne4pg2/oxid_1.9x2.5_L26_2015_ne4pg2_c20250813.nc
20100101
${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc
From cb7dbcdf7325305d5a009167cd0115e2274fa30a Mon Sep 17 00:00:00 2001
From: Meng Huang <57012216+meng630@users.noreply.github.com>
Date: Tue, 26 Aug 2025 12:29:26 -0400
Subject: [PATCH 2/5] Update linoz files to cdf format
---
components/eamxx/cime_config/namelist_defaults_eamxx.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/eamxx/cime_config/namelist_defaults_eamxx.xml b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
index d87aff6cd355..1889ccbbf507 100644
--- a/components/eamxx/cime_config/namelist_defaults_eamxx.xml
+++ b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
@@ -317,8 +317,8 @@ be lost if SCREAM_HACK_XML is not enabled.
4
193.0
20100101
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne30pg2_c20250815.nc
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250815.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne30pg2_c20250826.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250826.nc
20150101
${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_2015_ne30pg2_c20250813.nc
From 0ba952d989c57ef424e0d54d6a9f4190e43fcb08 Mon Sep 17 00:00:00 2001
From: singhbalwinder
Date: Fri, 29 Aug 2025 12:05:15 -0700
Subject: [PATCH 3/5] Revert LINOZ files to check BFBness
---
components/eamxx/cime_config/namelist_defaults_eamxx.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/eamxx/cime_config/namelist_defaults_eamxx.xml b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
index 1889ccbbf507..f42417f4d9f5 100644
--- a/components/eamxx/cime_config/namelist_defaults_eamxx.xml
+++ b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
@@ -317,8 +317,8 @@ be lost if SCREAM_HACK_XML is not enabled.
4
193.0
20100101
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne30pg2_c20250826.nc
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250826.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne30pg2_c20240724.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne4pg2_c20240724.nc
20150101
${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_2015_ne30pg2_c20250813.nc
From 7dc46688ea1adfb2eb721ea138ddd267b8331bed Mon Sep 17 00:00:00 2001
From: singhbalwinder
Date: Fri, 29 Aug 2025 15:54:22 -0700
Subject: [PATCH 4/5] Update oxid file for the microphysics standalone test
---
.../eamxx/tests/single-process/mam/aero_microphys/input.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/eamxx/tests/single-process/mam/aero_microphys/input.yaml b/components/eamxx/tests/single-process/mam/aero_microphys/input.yaml
index dd495454726c..7da865039611 100644
--- a/components/eamxx/tests/single-process/mam/aero_microphys/input.yaml
+++ b/components/eamxx/tests/single-process/mam/aero_microphys/input.yaml
@@ -21,7 +21,7 @@ eamxx:
mam4_psc_T : 193.0
mam4_linoz_ymd : 20100101
mam4_linoz_file_name : ${SCREAM_DATA_DIR}/mam4xx/linoz/ne2np4/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne2np4_c20240724.nc
- mam4_oxid_file_name : ${SCREAM_DATA_DIR}/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_1850-2015_c20240827.nc
+ mam4_oxid_file_name : ${SCREAM_DATA_DIR}/mam4xx/invariants/ne2np4/oxid_ne2np4_L26_2015_c20250813.nc
mam4_oxid_ymd : 20150101
mam4_linoz_chlorine_file : ${SCREAM_DATA_DIR}/mam4xx/linoz/Linoz_Chlorine_Loading_CMIP6_0003-2017_c20171114.nc
mam4_chlorine_loading_ymd : 20100101
From 0ffb55ee521b56eb93c17e354e1aa8033922cada Mon Sep 17 00:00:00 2001
From: Balwinder Singh
Date: Fri, 12 Sep 2025 06:24:27 -0700
Subject: [PATCH 5/5] Added the new single year LINOZ files back
---
components/eamxx/cime_config/namelist_defaults_eamxx.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/components/eamxx/cime_config/namelist_defaults_eamxx.xml b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
index f42417f4d9f5..1889ccbbf507 100644
--- a/components/eamxx/cime_config/namelist_defaults_eamxx.xml
+++ b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
@@ -317,8 +317,8 @@ be lost if SCREAM_HACK_XML is not enabled.
4
193.0
20100101
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne30pg2_c20240724.nc
- ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz1850-2015_2010JPL_CMIP6_10deg_58km_ne4pg2_c20240724.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne30pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne30pg2_c20250826.nc
+ ${DIN_LOC_ROOT}/atm/scream/mam4xx/linoz/ne4pg2/linoz2010_2010JPL_CMIP6_10deg_58km_ne4pg2_c20250826.nc
20150101
${DIN_LOC_ROOT}/atm/scream/mam4xx/invariants/ne30pg2/oxid_1.9x2.5_L26_2015_ne30pg2_c20250813.nc