diff --git a/.gitmodules b/.gitmodules
index f0e6ed2ef6..2bc9a4a25a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -36,7 +36,7 @@ fxDONOTUSEurl = https://github.com/NGEET/fates
[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/CISM-wrapper
-fxtag = cismwrap_2_2_010
+fxtag = cismwrap_2_2_011
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
@@ -68,7 +68,7 @@ fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
-fxtag = ccs_config_cesm1.0.61_add_domain_ne3np4.pg2_1
+fxtag = ccs_config_cesm1.0.66
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
diff --git a/bld/namelist_files/namelist_defaults_ctsm.xml b/bld/namelist_files/namelist_defaults_ctsm.xml
index 6ef265e6d4..068d57d23e 100644
--- a/bld/namelist_files/namelist_defaults_ctsm.xml
+++ b/bld/namelist_files/namelist_defaults_ctsm.xml
@@ -405,9 +405,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
0.85d00
0.98d00
0.03d00
-0.28d-4
+0.58d-4
0.010d00
-0.71d-4
+0.75d-4
0.34d00
0.33d00
75.d00
@@ -417,7 +417,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
95.
1.8d00
0.6d00
- 0.35d00
+ 0.3d00
6.5d00
@@ -527,7 +527,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
Sturm1997
Jordan1991
-Jordan1991
+Sturm1997
Jordan1991
Sturm1997
@@ -572,7 +572,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
-lnd/clm2/paramdata/clm60_params.crop_omni02.c251120.nc
+lnd/clm2/paramdata/ctsm60_params.c251124.nc
lnd/clm2/paramdata/clm50_params.c250311.nc
lnd/clm2/paramdata/clm45_params.c250311.nc
diff --git a/ccs_config b/ccs_config
index d686615fac..76370cc085 160000
--- a/ccs_config
+++ b/ccs_config
@@ -1 +1 @@
-Subproject commit d686615faceac30705b199f592808e3558ac176b
+Subproject commit 76370cc08587fd653458cdfb2e0b220b3168ded6
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index e991288cc5..2860165114 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -436,7 +436,7 @@ Caveats:
char
- v1,v2,v3,latest
+ v1,v2,v3,v4,latest
latest
run_component_ctsm
env_run.xml
diff --git a/components/cism b/components/cism
index 84767787b7..d18e0a3e1a 160000
--- a/components/cism
+++ b/components/cism
@@ -1 +1 @@
-Subproject commit 84767787b78a3547497cd3f1b452e775cdc56f95
+Subproject commit d18e0a3e1aa97e8525e239904d6b0dea39886f05
diff --git a/doc/source/tech_note/Fire/CLM50_Tech_Note_Fire.rst b/doc/source/tech_note/Fire/CLM50_Tech_Note_Fire.rst
index 84dd2bcaaf..0483567ff5 100644
--- a/doc/source/tech_note/Fire/CLM50_Tech_Note_Fire.rst
+++ b/doc/source/tech_note/Fire/CLM50_Tech_Note_Fire.rst
@@ -354,9 +354,9 @@ The burned area due to peat fires is given as :math:`{A}_{b}`:
.. math::
:label: 23.37
- A_{b} = c \ f_{cli,p} f_{peat} (1 - f_{sat} ) A_{g}
+ A_{b} = c \ f_{cli,p} f_{peat} A_{g}
-where :math:`c` (s\ :sup:`-1`) is a constant; :math:`f_{cli,p}` represents the effect of climate on the burned area; :math:`f_{peat}` is the fractional coverage of peatland in the grid cell; and :math:`f_{sat}` is the fraction of the grid cell with a water table at the surface or higher. :math:`c` = 0.17 :math:`\times` 10 :sup:`-3` hr\ :sup:`-1` for tropical peat fires and :math:`c` = 0.9 :math:`\times` 10 :sup:`-5` hr :sup:`-1` for boreal peat fires are derived using an inverse method, by matching simulations to earlier studies: about 2.4 Mha peatland was burned over Indonesia in 1997 (:ref:`Page et al. 2002 `) and the average burned area of peat fires in Western Canada was 0.2 Mha yr :sup:`-1` for 1980-1999 (:ref:`Turetsky et al. 2004 `).
+where :math:`c` (s\ :sup:`-1`) is a constant; :math:`f_{cli,p}` represents the effect of climate on the burned area; and :math:`f_{peat}` is the fractional coverage of peatland in the grid cell. :math:`c` = 0.17 :math:`\times` 10 :sup:`-3` hr\ :sup:`-1` for tropical peat fires and :math:`c` = 0.9 :math:`\times` 10 :sup:`-5` hr :sup:`-1` for boreal peat fires are derived using an inverse method, by matching simulations to earlier studies: about 2.4 Mha peatland was burned over Indonesia in 1997 (:ref:`Page et al. 2002 `) and the average burned area of peat fires in Western Canada was 0.2 Mha yr :sup:`-1` for 1980-1999 (:ref:`Turetsky et al. 2004 `).
For tropical peat fires, :math:`f_{cli,p}` is set as a function of long-term precipitation :math:`P_{60d}` :
diff --git a/python/ctsm/site_and_regional/tower_arg_parse.py b/python/ctsm/site_and_regional/tower_arg_parse.py
index 33b3db2afa..10ede664db 100644
--- a/python/ctsm/site_and_regional/tower_arg_parse.py
+++ b/python/ctsm/site_and_regional/tower_arg_parse.py
@@ -195,7 +195,7 @@ def get_parser(args, description, valid_neon_sites, valid_plumber_sites):
dest="user_version",
required=False,
type=str,
- choices=["v1", "v2", "v3"],
+ choices=["v1", "v2", "v3", "v4"],
)
parser.add_argument(
diff --git a/src/biogeochem/CNFireLi2024Mod.F90 b/src/biogeochem/CNFireLi2024Mod.F90
index d4c05f63bc..66f5b10fba 100644
--- a/src/biogeochem/CNFireLi2024Mod.F90
+++ b/src/biogeochem/CNFireLi2024Mod.F90
@@ -187,7 +187,6 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
rswf_min => pftcon%rswf_min , & ! Input:
rswf_max => pftcon%rswf_max , & ! Input:
btran2 => this%cnfire_base_type%btran2_patch , & ! Input: [real(r8) (:) ] root zone soil wetness
- fsat => saturated_excess_runoff_inst%fsat_col , & ! Input: [real(r8) (:) ] fractional area with water table at surface
wf2 => waterdiagnosticbulk_inst%wf2_col , & ! Input: [real(r8) (:) ] soil water as frac. of whc for top 0.17 m
is_cwd => decomp_cascade_con%is_cwd , & ! Input: [logical (:) ] TRUE => pool is a cwd pool
@@ -517,10 +516,6 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
g = col%gridcell(c)
! For crop
- ! cropf_col(c) * col%wtgcell(c) > 0.1_r8 is added because fires are rare in
- ! gridcells with limited cropland coverage based on GFED5. Also, this helps to
- ! avoid abm (crop fire peak month) regridding error from 0.05 degree to lower resolution
- ! The condition could be removed if CLM supports the use of mode in abm inputs regridding
if( forc_t(c) >= SHR_CONST_TKFRZ .and. patch%itype(p) > nc4_grass .and. &
kmo == abm_lf(c) .and. &
burndate(p) >= 999 .and. patch%wtcol(p) > 0._r8 )then ! catch crop burn time
@@ -556,8 +551,7 @@ subroutine CNFireArea (this, bounds, num_soilc, filter_soilc, num_soilp, filter_
end if
else
baf_peatf(c) = boreal_peatfire_c/secsphr*exp(-SHR_CONST_PI*(max(wf2(c),0._r8)/borpeat_fire_soilmoist_denom))* &
- max(0._r8,min(1._r8,(tsoi17(c)-SHR_CONST_TKFRZ)/10._r8))*peatf_lf(c)* &
- (1._r8-fsat(c))
+ max(0._r8,min(1._r8,(tsoi17(c)-SHR_CONST_TKFRZ)/10._r8))*peatf_lf(c)
end if
end do
!