From 5cf4216f279ad55739b17570a97b8555fa50a8fc Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Thu, 22 Aug 2024 16:28:26 -0600
Subject: [PATCH 01/10] Turn on explicit AC, Leung_2023, and excess ice by
 default

---
 bld/namelist_files/namelist_defaults_ctsm.xml      | 10 +++++-----
 bld/namelist_files/namelist_defaults_dust_emis.xml |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 8aacd3a64d..70ba56e69b 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -161,7 +161,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <calc_human_stress_indices phys="clm4_5" >NONE</calc_human_stress_indices>
 
 <!-- Explicit, time-varying urban air conditioning adoption rate scheme -->
-<urban_explicit_ac phys="clm6_0" >.false.</urban_explicit_ac>
+<urban_explicit_ac phys="clm6_0" >.true.</urban_explicit_ac>
 <urban_explicit_ac phys="clm5_1" >.false.</urban_explicit_ac>
 <urban_explicit_ac phys="clm5_0" >.false.</urban_explicit_ac>
 <urban_explicit_ac phys="clm4_5" >.false.</urban_explicit_ac>
@@ -2449,15 +2449,15 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
 <stream_fldfilename_urbantv phys="clm6_0" hgrid="0.9x1.25" urban_explicit_ac=".false."
 >lnd/clm2/urbandata/CTSM52_tbuildmax_OlesonFeddema_2020_0.9x1.25_simyr1849-2106_c200605.nc</stream_fldfilename_urbantv>
 <stream_fldfilename_urbantv phys="clm6_0"  hgrid="0.9x1.25" urban_explicit_ac=".true."
->/glade/work/xinchang/02_Explicit_AC_Adoption/02_data_present_day/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
+>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
 <stream_fldfilename_urbantv phys="clm5_1" hgrid="0.9x1.25" urban_explicit_ac=".false."
 >lnd/clm2/urbandata/CTSM52_tbuildmax_OlesonFeddema_2020_0.9x1.25_simyr1849-2106_c200605.nc</stream_fldfilename_urbantv>
 <stream_fldfilename_urbantv phys="clm5_1"  hgrid="0.9x1.25" urban_explicit_ac=".true."
->/glade/work/xinchang/02_Explicit_AC_Adoption/02_data_present_day/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
+>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
 <stream_fldfilename_urbantv phys="clm5_0" hgrid="0.9x1.25" urban_explicit_ac=".false."
 >lnd/clm2/urbandata/CLM50_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc</stream_fldfilename_urbantv>
 <stream_fldfilename_urbantv phys="clm5_0" hgrid="0.9x1.25" urban_explicit_ac=".true."
->/glade/work/xinchang/02_Explicit_AC_Adoption/02_data_present_day/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
+>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
 <stream_fldfilename_urbantv phys="clm4_5" hgrid="0.9x1.25"
 >lnd/clm2/urbandata/CLM45_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc</stream_fldfilename_urbantv>
 
@@ -2694,7 +2694,7 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
 <!-- Defaults for excess ice                    -->
 <!-- =========================================  -->
 
-<use_excess_ice>.false.</use_excess_ice>
+<use_excess_ice>.true.</use_excess_ice>
 <excess_ice_coldstart_temp>-1.0</excess_ice_coldstart_temp>
 <excess_ice_coldstart_depth>0.5</excess_ice_coldstart_depth>
 <excess_ice_coldstart_temp use_excess_ice=".true.">-3.15</excess_ice_coldstart_temp>
diff --git a/bld/namelist_files/namelist_defaults_dust_emis.xml b/bld/namelist_files/namelist_defaults_dust_emis.xml
index 40bf3d9078..319110cc55 100644
--- a/bld/namelist_files/namelist_defaults_dust_emis.xml
+++ b/bld/namelist_files/namelist_defaults_dust_emis.xml
@@ -14,7 +14,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 -->
 
 <!-- Defaults for dust_emis_inparm namelist  -->
-<dust_emis_method>Zender_2003</dust_emis_method>
+<dust_emis_method>Leung_2023</dust_emis_method>
 
 <zender_soil_erod_source>atm</zender_soil_erod_source>
 

From e4a3c18c03deaa40df15bbff42f03204a3a93d4b Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Thu, 22 Aug 2024 16:59:10 -0600
Subject: [PATCH 02/10] Add finidat entries for f09/1850/clm6 cases

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 70ba56e69b..e94863b32e 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1345,6 +1345,18 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
 >lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm60BgcCrop-ciso.1361-01-01.ne30pg3_mg17_c240317.nc
 </finidat>
+<finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
+         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
+         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
+         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
+</finidat>
+<finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
+         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".true."
+         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
+         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
+</finidat>
 
 <!--
      Present day IC (if use_init_interp is set and .true. then MUST still interpolate even on an exact match)

From b12cea1d6061450be368138fb12a1eacd9340972 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Thu, 22 Aug 2024 17:08:03 -0600
Subject: [PATCH 03/10] Revisions so that changes apply to clm6 only

---
 bld/namelist_files/namelist_defaults_ctsm.xml      | 8 ++++----
 bld/namelist_files/namelist_defaults_dust_emis.xml | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index e94863b32e..20f6d4702a 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -161,10 +161,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <calc_human_stress_indices phys="clm4_5" >NONE</calc_human_stress_indices>
 
 <!-- Explicit, time-varying urban air conditioning adoption rate scheme -->
+<urban_explicit_ac>.false.</urban_explicit_ac>
 <urban_explicit_ac phys="clm6_0" >.true.</urban_explicit_ac>
-<urban_explicit_ac phys="clm5_1" >.false.</urban_explicit_ac>
-<urban_explicit_ac phys="clm5_0" >.false.</urban_explicit_ac>
-<urban_explicit_ac phys="clm4_5" >.false.</urban_explicit_ac>
 
 <!-- Default urban traffic flux -->
 <urban_traffic>.false.</urban_traffic>
@@ -2706,7 +2704,9 @@ lnd/clm2/surfdata_esmf/NEON/surfdata_1x1_NEON_TOOL_hist_78pfts_CMIP6_simyr2000_c
 <!-- Defaults for excess ice                    -->
 <!-- =========================================  -->
 
-<use_excess_ice>.true.</use_excess_ice>
+<use_excess_ice>.false.</use_excess_ice>
+<use_excess_ice phys="clm6_0">.true.</use_excess_ice>
+
 <excess_ice_coldstart_temp>-1.0</excess_ice_coldstart_temp>
 <excess_ice_coldstart_depth>0.5</excess_ice_coldstart_depth>
 <excess_ice_coldstart_temp use_excess_ice=".true.">-3.15</excess_ice_coldstart_temp>
diff --git a/bld/namelist_files/namelist_defaults_dust_emis.xml b/bld/namelist_files/namelist_defaults_dust_emis.xml
index 319110cc55..a13a23d14b 100644
--- a/bld/namelist_files/namelist_defaults_dust_emis.xml
+++ b/bld/namelist_files/namelist_defaults_dust_emis.xml
@@ -14,7 +14,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 -->
 
 <!-- Defaults for dust_emis_inparm namelist  -->
-<dust_emis_method>Leung_2023</dust_emis_method>
+<dust_emis_method>Zender_2003</dust_emis_method>
+<dust_emis_method phys="clm6_0">Leung_2023</dust_emis_method>
 
 <zender_soil_erod_source>atm</zender_soil_erod_source>
 

From c61aca3708a8908639a884a3bd5926b23b8b5aa5 Mon Sep 17 00:00:00 2001
From: Erik Kluzek <erik@ucar.edu>
Date: Fri, 23 Aug 2024 02:07:57 -0600
Subject: [PATCH 04/10] Update to use the new ctsm5.3 finidat file for f09 1850

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 20f6d4702a..8e6b9b5d51 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -928,13 +928,14 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 <!-- 1850 for CLM5.1/CLM6.0 -->
 <init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm5_1"
->hgrid=ne30np4.pg3 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_GSWP3v1
+>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm5_1_GSWP3v1
 </init_interp_attributes>
 
 <init_interp_attributes sim_year="1850" use_cndv=".false." use_fates=".false." phys="clm6_0"
->hgrid=ne30np4.pg3 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_GSWP3v1
+>hgrid=0.9x1.25 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.false. glc_nex=10 do_transient_pfts=.false. lnd_tuning_mode=clm6_0_GSWP3v1
 </init_interp_attributes>
 
+
 <!-- present day -->
 <init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm4_5_GSWP3v1"
 >hgrid=1.9x2.5 maxpft=79 mask=gx1v7 use_cn=.true. use_crop=.true. irrigate=.true. glc_nec=10 do_transient_pfts=.false.
@@ -1335,23 +1336,17 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >lnd/clm2/initdata_map/clmi.I1850Clm50SpCru.1706-01-01.0.9x1.25_gx1v7_simyr1850_c200806.nc
 </finidat>
 
-<!-- CTSM6_0 - use clm6_0_GSWP3v1 BgcCrop at ne30pg3_mg17 for all clm5_1/clm6_0 options -->
-<!-- use_init_interp true because even though this is a ctsm5.2 dataset it was with early fsurfdat files -->
-<finidat hgrid="ne30np4.pg3" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
-         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
-         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
-         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
->lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm60BgcCrop-ciso.1361-01-01.ne30pg3_mg17_c240317.nc
-</finidat>
+<!-- CTSM6_0 - use clm6_0_GSWP3v1 BgcCrop at f09 for all clm5_1/clm6_0 options -->
+<!-- use_init_interp true because the file was created with ctsm5.3 datasets -->
 <finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
-         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
+         lnd_tuning_mode="clm5_1_GSWP3v1" use_init_interp=".true."
 >lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 <finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
-         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".true."
-         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
+         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
+         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
          lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
 >lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>

From d4042ee5074e57bce27d11394264f4c786212ba5 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 23 Aug 2024 10:47:32 -0600
Subject: [PATCH 05/10] This may be the finidat fix (based on the aux_clm
 failures on izumi)

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 20f6d4702a..cee86cdbd2 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1341,18 +1341,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
          lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
->lnd/clm2/initdata_esmf/ctsm5.2/clmi.I1850Clm60BgcCrop-ciso.1361-01-01.ne30pg3_mg17_c240317.nc
-</finidat>
-<finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
-         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".false."
-         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".false."
-         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
->lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
-</finidat>
-<finidat hgrid="0.9x1.25" mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
-         ic_ymd="18500101" sim_year="1850" do_transient_pfts=".true."
-         ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
-         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
 >lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
@@ -1394,7 +1382,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm6_0_GSWP3v1"
->lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm52BgcCrop.2000-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240515.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 

From 5d6987ed5bce252961f0ca011f9762019ef20dc2 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 23 Aug 2024 12:44:58 -0600
Subject: [PATCH 06/10] More finidat changes based on aux_clm failure on
 derecho

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index c6afee6f90..fdaee2bcaa 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1473,7 +1473,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_1_cam7.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- clm6_0 and cam7.0 -->
@@ -1481,7 +1481,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm6_0_cam7.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- clm5_0 and cam7.0 -->
@@ -1545,7 +1545,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_1_cam7.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- 2003 -->
@@ -1608,7 +1608,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm6_0_cam7.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- 2003 -->
@@ -1682,14 +1682,14 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_1_cam6.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm6_0_cam6.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- 2003 -->
@@ -1753,7 +1753,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm5_1_cam6.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- 2003 -->
@@ -1817,7 +1817,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
          lnd_tuning_mode="clm6_0_cam6.0" use_init_interp=".true."
->lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
+>lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
 <!-- 2003 -->

From 8594b7d9c2b3e8a07c8d383d4218fc231a0e64ab Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 23 Aug 2024 14:49:09 -0600
Subject: [PATCH 07/10] Add comments about the new finidat file

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index fdaee2bcaa..dacf75be02 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1385,6 +1385,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
          lnd_tuning_mode="clm5_1_GSWP3v1"
 >lnd/clm2/initdata_esmf/ctsm5.2/clmi.I2000Clm50BgcCrop.2011-01-01.1.9x2.5_gx1v7_gl4_simyr2000_c240223.nc
 </finidat>
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1469,6 +1470,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 
 
 <!-- clm5_1 and cam7.0 -->
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1477,6 +1479,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </finidat>
 
 <!-- clm6_0 and cam7.0 -->
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1541,6 +1544,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </finidat>
 
 <!-- Present day for coupled cases at 1-degree or lower resolutions  -->
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1604,6 +1608,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </finidat>
 
 <!-- Present day for coupled cases at 1-degree or lower resolutions  -->
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1678,6 +1683,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >lnd/clm2/initdata_map/clmi.BHIST.2000-01-01.0.9x1.25_gx1v7_simyr2000_c200728.nc
 </finidat>
 
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1685,6 +1691,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 >lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1749,6 +1756,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </finidat>
 
 <!-- Present day for coupled cases at 1-degree or lower resolutions  -->
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
@@ -1813,6 +1821,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 </finidat>
 
 <!-- Present day for coupled cases at 1-degree or lower resolutions  -->
+<!-- NB: This pSASU finidat is from an 1850 spin-up -->
 <finidat hgrid="0.9x1.25"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20000101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."

From 32637e666916aaa92bb7f8e36efdfddf1991b346 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 23 Aug 2024 14:49:39 -0600
Subject: [PATCH 08/10] Draft ChangeLog/ChangeSum

---
 doc/ChangeLog | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/ChangeSum |  1 +
 2 files changed, 85 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index f283f8a20c..d3fd86e6ac 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,88 @@
 ===============================================================
+Tag name: ctsm5.2.026
+Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
+Date: Fri 23 Aug 2024 01:23:43 PM MDT
+One-line Summary: Turn on excess ice, explicit AC, Leung_2023 for clm6
+
+Purpose and description of changes
+----------------------------------
+
+ Turn on excess ice, explicit AC, Leung_2023 for clm6.
+
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[X] clm6_0
+
+[X] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
+Fixes #2466 Turn excess ice on by default in CESM3
+Fixes #2568 Turn on explicit AC, Leung_2023, and excess ice by default
+
+Notes of particular relevance for users
+---------------------------------------
+Changes made to namelist defaults (e.g., changed parameter values):
+ Namelist defaults changed to turn on excess ice, explicit AC, Leung_2023
+ in clm6; also to pick up new finidat files for clm6.
+
+Changes to the datasets (e.g., parameter, surface or initial files):
+ CLM6 cases need new finidat files. We use 1850 finidat files for
+ all clm6 cases because that's all that we have generated for now.
+
+Notes of particular relevance for developers:
+---------------------------------------------
+Caveats for developers (e.g., code that is duplicated that requires double maintenance):
+ CLM6 cases need new finidat files. We use 1850 finidat files for
+ all clm6 cases because that's all that we have generated for now.
+
+Testing summary:
+----------------
+
+ [PASS means all tests PASS; OK means tests PASS other than expected fails.]
+
+  build-namelist tests (if CLMBuildNamelist.pm has changed):
+
+    derecho - OK, expected FAIL> <Test Id: 379> <Desc: LeungDust_WO_Prigent
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- IN PROG
+    izumi ------- IN PROG
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: Yes
+
+  Summarize any changes to answers, i.e.,
+    - what code configurations: clm6, clm51
+    - what platforms/compilers: all
+    - nature of change: more than roundoff
+
+
+Other details
+-------------
+Pull Requests that document the changes (include PR ids):
+ https://github.com/ESCOMP/ctsm/pull/2724
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.025
 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
 Date: Fri Aug 23 12:27:51 MDT 2024
diff --git a/doc/ChangeSum b/doc/ChangeSum
index ce290045fa..6071278954 100644
--- a/doc/ChangeSum
+++ b/doc/ChangeSum
@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       ctsm5.2.026   slevis 08/23/2024 Turn on excess ice, explicit AC, Leung_2023 for clm6
        ctsm5.2.025 samrabin 08/23/2024 Minor fixes to li2024 fire methods
        ctsm5.2.024 samrabin 08/22/2024 Improve li2024 fire methods
        ctsm5.2.023 samrabin 08/16/2024 Merge b4b-dev

From dd9b1b0ab6bd715ccfb77031a0b8575f446d39d1 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 23 Aug 2024 15:52:29 -0600
Subject: [PATCH 09/10] Add use_init_interp to an f19 test using the new f09
 finidat

---
 bld/namelist_files/namelist_defaults_ctsm.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index dacf75be02..df3927fd0e 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -1389,7 +1389,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <finidat hgrid="1.9x2.5"    maxpft="79"  mask="gx1v7" use_cn=".true." use_cndv=".false." use_fates=".false."
          ic_ymd="20110101" sim_year="2000" do_transient_pfts=".false."
          ic_tod="0" glc_nec="10" use_crop=".true." irrigate=".true."
-         lnd_tuning_mode="clm6_0_GSWP3v1"
+         lnd_tuning_mode="clm6_0_GSWP3v1" use_init_interp=".true."
 >lnd/clm2/initdata_esmf/ctsm5.3/ctsm52018_f09_xsiceON_acON_pSASU.clm2.r.0201-01-01-00000.nc
 </finidat>
 

From 7f76dc031638b399546d15c07effa25522c52422 Mon Sep 17 00:00:00 2001
From: Samuel Levis <slevis@ucar.edu>
Date: Fri, 23 Aug 2024 17:28:15 -0600
Subject: [PATCH 10/10] Updated ChangeLog

---
 doc/ChangeLog | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index d3fd86e6ac..96c0d6735b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,7 +1,7 @@
 ===============================================================
 Tag name: ctsm5.2.026
 Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
-Date: Fri 23 Aug 2024 01:23:43 PM MDT
+Date: Fri 23 Aug 2024 05:17:56 PM MDT
 One-line Summary: Turn on excess ice, explicit AC, Leung_2023 for clm6
 
 Purpose and description of changes
@@ -38,17 +38,17 @@ Fixes #2568 Turn on explicit AC, Leung_2023, and excess ice by default
 Notes of particular relevance for users
 ---------------------------------------
 Changes made to namelist defaults (e.g., changed parameter values):
- Namelist defaults changed to turn on excess ice, explicit AC, Leung_2023
- in clm6; also to pick up new finidat files for clm6.
+ Namelist defaults now turn on excess ice, explicit AC, Leung_2023
+ in clm6; they also pick up new finidat files for clm6.
 
 Changes to the datasets (e.g., parameter, surface or initial files):
- CLM6 cases need new finidat files. We use 1850 finidat files for
+ CLM6 cases need new finidat files. We use a f09 1850 finidat for
  all clm6 cases because that's all that we have generated for now.
 
 Notes of particular relevance for developers:
 ---------------------------------------------
 Caveats for developers (e.g., code that is duplicated that requires double maintenance):
- CLM6 cases need new finidat files. We use 1850 finidat files for
+ CLM6 cases need new finidat files. We use a f09 1850 finidat for
  all clm6 cases because that's all that we have generated for now.
 
 Testing summary:
@@ -62,8 +62,8 @@ Testing summary:
 
   regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
 
-    derecho ----- IN PROG
-    izumi ------- IN PROG
+    derecho ----- OK
+    izumi ------- OK
 
 Answer changes
 --------------
@@ -75,6 +75,8 @@ Changes answers relative to baseline: Yes
     - what platforms/compilers: all
     - nature of change: more than roundoff
 
+ Details about the diffs from excess ice and explicit AC may be found in
+ the earlier entries of this ChangeLog for ctsm5.2.018 and ctsm5.2.010.
 
 Other details
 -------------