Merge remote-tracking branch 'escomp/master' into ans_chging_tag_1

Merging ctsm5.2.025

doc/ChangeLog

@@ -1,4 +1,65 @@
 ===============================================================
+Tag name: ctsm5.2.025
+Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
+Date: Fri Aug 23 12:27:51 MDT 2024
+One-line Summary: Minor fixes to li2024 fire methods
+
+Purpose and description of changes
+----------------------------------
+
+- Allow non-agricultural fire in tropical closed forests in the last timestep of the month
+- li2024 fire now fully obeys cli_scale (b4b change because default parameter matched the magic number)
+
+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.)
+
+[ ] clm6_0
+
+[ ] clm5_1
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+
+Bugs fixed
+----------
+
+List of CTSM issues fixed (include CTSM Issue # and description):
+- Resolves ESCOMP/CTSM#2725: Minor bugs in li2024 fire (https://github.com/ESCOMP/CTSM/issues/2725)
+
+
+Testing summary:
+----------------
+
+  regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
+
+    derecho ----- OK
+    izumi ------- OK
+
+  Note that some Derecho tests did not complete. However, all the fire tests did, and none
+  of the other tests use the code that was modified here.
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: No
+
+
+Other details
+-------------
+
+Pull Requests that document the changes (include PR ids):
+- ESCOMP/CTSM#2726: Bug fixes to li2024 fire (https://github.com/ESCOMP/CTSM/pull/2726)
+
+===============================================================
+===============================================================
 Tag name: ctsm5.2.024
 Originator(s): samrabin (Sam Rabin, UCAR/TSS, samrabin@ucar.edu)
 Date: Thu Aug 22 11:07:11 MDT 2024

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+       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
        ctsm5.2.022 samrabin 08/14/2024 Rework crop_calendars suite and cropMonthOutput

src/biogeochem/CNFireLi2024Mod.F90

@@ -632,8 +632,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
                  if(( kmo == 1 .and. kda == 1 .and. mcsec == 0) .or. &
                       dtrotr_col(c) <=0._r8 )then
                     fbac1(c)        = 0._r8
-                    farea_burned(c) = baf_crop(c)+baf_peatf(c)
-                 else
+                 else  ! SSR: Why are the code blocks above and below this else mutually exclusive?
                     ! Calculate the precip threshold as the area-weighted mean of that for BET and BDT
                     cri = (defo_fire_precip_thresh_bet * trotr1_col(c) &
                          + defo_fire_precip_thresh_bdt * trotr2_col(c)) &
@@ -643,7 +642,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
                          (15._r8*min(0.0016_r8,dtrotr_col(c)/dt*dayspyr*secspday)+0.009_r8)* &
                          max(0._r8,min(1._r8,(0.25_r8-(forc_rain(c)+forc_snow(c))*secsphr)/0.25_r8))
 
-                    farea_burned(c) = farea_burned(c)+fb*cli*(0.01_r8/secspday)
+                    farea_burned(c) = farea_burned(c)+fb*cli*(cli_scale/secspday)
                     ! burned area out of conversion region due to land use fire
                     fbac1(c) = max(0._r8,fb*cli*(cli_scale/secspday) - 2.0_r8*lfc(c)/dt)
                  end if