From dc3317db21998538cfc3862ca274ff6cc3dd1bae Mon Sep 17 00:00:00 2001
From: Sam Rabin <samrabin@ucar.edu>
Date: Thu, 12 Sep 2024 15:56:15 -0600
Subject: [PATCH 1/2] Replace default fire_method li2021gswpfrc with
 li2024crujra.

---
 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 0188f91faa..e4617c3b94 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -238,7 +238,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
 <melt_non_icesheet_ice_runoff phys="clm4_5" >.false.</melt_non_icesheet_ice_runoff>
 
 <!-- CN Fire model method defaults -->
-<fire_method               >li2021gswpfrc</fire_method>
+<fire_method               >li2024crujra</fire_method>
 <fire_method phys="clm5_0" >li2016crufrc</fire_method>
 <fire_method phys="clm4_5" >li2014qianfrc</fire_method>
 

From 92b76e78ab654c9e659f894c13fa6a88386f8899 Mon Sep 17 00:00:00 2001
From: Sam Rabin <samrabin@ucar.edu>
Date: Thu, 12 Sep 2024 15:58:07 -0600
Subject: [PATCH 2/2] Remove FireLi2024CruJra test from aux_clm, since it's now
 default.

---
 cime_config/testdefs/testlist_clm.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cime_config/testdefs/testlist_clm.xml b/cime_config/testdefs/testlist_clm.xml
index 57e798b963..5bf3909210 100644
--- a/cime_config/testdefs/testlist_clm.xml
+++ b/cime_config/testdefs/testlist_clm.xml
@@ -3562,7 +3562,6 @@
 
   <test name="SMS_D_Ld65" grid="f10_f10_mg37" compset="I2000Clm60BgcCrop" testmods="clm/FireLi2024CruJra">
     <machines>
-      <machine name="derecho" compiler="intel" category="aux_clm"/>
       <machine name="derecho" compiler="intel" category="fire"/>
     </machines>
     <options>