Skip to content

Commit ee8b281

Browse files
committed
Merge tag 'ctsm5.4.012' into tweaked_ciso_file
Fix for C-balance error that manifested in B-cases with pft 67 Issue ESCOMP#3678 PR ESCOMP#3702 Changes answers more than roundoff (same climate) and occurs rarely.
2 parents cd52e2b + aee764b commit ee8b281

3 files changed

Lines changed: 79 additions & 1 deletion

File tree

doc/ChangeLog

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,64 @@
11
===============================================================
2+
Tag name: ctsm5.4.012
3+
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
4+
Date: Mon Jan 26 03:13:02 PM MST 2026
5+
One-line Summary: Fix C-balance error for partly emerged crops
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
In CNPhenology, to the section "plant had emerged before harvest" I added a subsection "plant partly emerged from the ground" that repeats the code from the "else" section just after that's labeled "plant never emerged from the ground."
11+
12+
Significant changes to scientifically-supported configurations
13+
--------------------------------------------------------------
14+
15+
Does this tag change answers significantly for any of the following physics configurations?
16+
(Details of any changes will be given in the "Answer changes" section below.)
17+
18+
[Put an [X] in the box for any configuration with significant answer changes.]
19+
20+
[ ] clm6_0
21+
22+
[ ] clm5_0
23+
24+
[ ] ctsm5_0-nwp
25+
26+
[ ] clm4_5
27+
28+
29+
Bugs fixed
30+
----------
31+
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
32+
Fixes #3678
33+
34+
Testing summary:
35+
----------------
36+
[PASS means all tests PASS; OK means tests PASS other than expected fails.]
37+
38+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
39+
40+
derecho ----- OK
41+
izumi ------- OK
42+
43+
Answer changes
44+
--------------
45+
46+
Changes answers relative to baseline: Yes
47+
48+
- Configurations: Four BASELINE tests show DIFFs. Three derecho_intel, one izumi_nag, all four I2000Clm60BgcCrop:
49+
ERP_P64x2_Ld765.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel.clm-monthly BASELINE ctsm5.4.011: DIFF
50+
ERS_Ly3.f10_f10_mg37.I2000Clm60BgcCrop.derecho_intel BASELINE ctsm5.4.011: DIFF
51+
SMS_Ly2_PS.f19_g17.I2000Clm60BgcCrop.derecho_intel.clm-cropMonthOutput BASELINE ctsm5.4.011: DIFF
52+
SMS_D_Ld65.f10_f10_mg37.I2000Clm60BgcCrop.izumi_nag.clm-FireLi2024GSWP BASELINE ctsm5.4.011: DIFF
53+
- Nature of change: Potentially larger than roundoff (certainly in B-cases) but same climate and rare.
54+
55+
Other details
56+
-------------
57+
Pull Requests that document the changes (include PR ids):
58+
https://github.com/ESCOMP/ctsm/pull/3702
59+
60+
===============================================================
61+
===============================================================
262
Tag name: ctsm5.4.011
363
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
464
Date: Thu Jan 22 04:01:52 PM MST 2026

doc/ChangeSum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Tag Who Date Summary
22
============================================================================================================================
3+
ctsm5.4.012 slevis 01/26/2026 Fix C-balance error for partly emerged crops
34
ctsm5.4.011 slevis 01/22/2026 Merge b4b-dev to master
45
ctsm5.4.010 erik 01/21/2026 Update cime to version that changes answers for ERI tests
56
ctsm5.4.009 olyson 01/19/2026 Dewpoint Temperature check for bare ground

src/biogeochem/CNPhenologyMod.F90

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2553,6 +2553,24 @@ subroutine CropPhenology(num_pcropp, filter_pcropp , &
25532553
if (tlai(p) > 0._r8) then ! plant had emerged before harvest
25542554
offset_flag(p) = 1._r8
25552555
offset_counter(p) = dt
2556+
2557+
! plant partly emerged from the ground
2558+
! Revert planting transfers; this will replenish the crop seed deficit.
2559+
! We subtract from any existing value in crop_seedc_to_leaf /
2560+
! crop_seedn_to_leaf in the event that we enter this block of
2561+
! code soon after the planting transfer originally occurred.
2562+
if (leafc_xfer(p) > 0._r8) then
2563+
crop_seedc_to_leaf(p) = crop_seedc_to_leaf(p) - leafc_xfer(p) / dt
2564+
crop_seedn_to_leaf(p) = crop_seedn_to_leaf(p) - leafn_xfer(p) / dt
2565+
leafc_xfer(p) = 0._r8
2566+
leafn_xfer(p) = leafc_xfer(p) / leafcn_t_evolving(p)
2567+
if (use_c13) then
2568+
c13_cnveg_carbonstate_inst%leafc_xfer_patch(p) = 0._r8
2569+
endif
2570+
if (use_c14) then
2571+
c14_cnveg_carbonstate_inst%leafc_xfer_patch(p) = 0._r8
2572+
endif
2573+
end if
25562574
else ! plant never emerged from the ground
25572575
! Revert planting transfers; this will replenish the crop seed deficit.
25582576
! We subtract from any existing value in crop_seedc_to_leaf /
@@ -2569,7 +2587,6 @@ subroutine CropPhenology(num_pcropp, filter_pcropp , &
25692587
if (use_c14) then
25702588
c14_cnveg_carbonstate_inst%leafc_xfer_patch(p) = 0._r8
25712589
endif
2572-
25732590
end if
25742591

25752592
! enter phase 3 while previous criteria fail and next is true;

0 commit comments

Comments
 (0)