Skip to content

Post 5.4 namelist updates #3626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Dec 2, 2025
+14 −20
Merged

Post 5.4 namelist updates #3626

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
80f4c01
append case names with optional experiment
wwieder Apr 14, 2023
0aa921a
add experiment flag for run_neon
wwieder Apr 17, 2023
f5db7a2
correction to get postAD and transient from postAD working
wwieder Apr 18, 2023
17ca65b
fire namelist defaults requested in #3608
wwieder Nov 24, 2025
d7928da
change default snow_thermal_cond_glc_method requested in #3598
wwieder Nov 24, 2025
1f417fd
Fire code cleanup requested in #3608
wwieder Nov 24, 2025
d4439c8
update cism per #3598
wwieder Nov 24, 2025
3096e94
remove conflicting file
wwieder Nov 24, 2025
00f16a4
update parameter file
wwieder Nov 24, 2025
362f6fa
update cism
wwieder Nov 25, 2025
fc9fd17
Update to ccs_config1.0.66
slevis-lmwg Dec 2, 2025
db4d8ad
Handpicked Will's mods from #3597 branch NEON_v4
slevis-lmwg Dec 2, 2025
995d9ab
Update formula in documentation to be consistent with this PR
slevis-lmwg Dec 2, 2025
b42fafc
Update comment in documentation to make consistent with formula change
slevis-lmwg Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<bt_min fire_method="li2024crujra" >0.85d00</bt_min>
<bt_max fire_method="li2024crujra" >0.98d00</bt_max>
<cli_scale fire_method="li2024crujra" >0.03d00</cli_scale>
<boreal_peatfire_c fire_method="li2024crujra" >0.28d-4</boreal_peatfire_c>
<boreal_peatfire_c fire_method="li2024crujra" >0.58d-4</boreal_peatfire_c>
<pot_hmn_ign_counts_alpha fire_method="li2024crujra" >0.010d00</pot_hmn_ign_counts_alpha>
<non_boreal_peatfire_c fire_method="li2024crujra" >0.71d-4</non_boreal_peatfire_c>
<non_boreal_peatfire_c fire_method="li2024crujra" >0.75d-4</non_boreal_peatfire_c>
<cropfire_a1 fire_method="li2024crujra" >0.34d00</cropfire_a1>
<occur_hi_gdp_tree fire_method="li2024crujra" >0.33d00</occur_hi_gdp_tree>
<lfuel fire_method="li2024crujra" >75.d00</lfuel>
Expand All @@ -417,7 +417,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<max_rh30_affecting_fuel fire_method="li2024crujra" >95.</max_rh30_affecting_fuel>
<defo_fire_precip_thresh_bet fire_method="li2024crujra" >1.8d00</defo_fire_precip_thresh_bet>
<defo_fire_precip_thresh_bdt fire_method="li2024crujra" >0.6d00</defo_fire_precip_thresh_bdt>
<borpeat_fire_soilmoist_denom fire_method="li2024crujra" > 0.35d00</borpeat_fire_soilmoist_denom>
<borpeat_fire_soilmoist_denom fire_method="li2024crujra" > 0.3d00</borpeat_fire_soilmoist_denom>
<nonborpeat_fire_precip_denom fire_method="li2024crujra" >6.5d00</nonborpeat_fire_precip_denom>


Expand Down Expand Up @@ -527,7 +527,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<snow_thermal_cond_method phys="clm6_0">Sturm1997</snow_thermal_cond_method>

<snow_thermal_cond_glc_method>Jordan1991</snow_thermal_cond_glc_method>
<snow_thermal_cond_glc_method phys="clm6_0">Jordan1991</snow_thermal_cond_glc_method>
<snow_thermal_cond_glc_method phys="clm6_0">Sturm1997</snow_thermal_cond_glc_method>

<snow_thermal_cond_lake_method>Jordan1991</snow_thermal_cond_lake_method>
<snow_thermal_cond_lake_method phys="clm6_0">Sturm1997</snow_thermal_cond_lake_method>
Expand Down Expand Up @@ -572,7 +572,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- The default filenames are given relative to the root directory
for the CLM2 data in the CESM distribution -->
<!-- Plant function types (relative to {csmdata}) -->
<paramfile phys="clm6_0" >lnd/clm2/paramdata/clm60_params.crop_omni02.c251120.nc</paramfile>
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c251124.nc</paramfile>
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>

Expand Down
8 changes: 1 addition & 7 deletions src/biogeochem/CNFireLi2024Mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
!
Expand Down