Skip to content

Commit 82a63cc

Browse files
authored
Merge pull request ESCOMP#1700 from rgknox/fates-pass-nclignan
FATES MIMICS coupling prep work
2 parents 449345e + 91a07e6 commit 82a63cc

File tree

4 files changed

+75
-1
lines changed

4 files changed

+75
-1
lines changed

Externals_CLM.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
local_path = src/fates
33
protocol = git
44
repo_url = https://github.com/NGEET/fates
5-
tag = sci.1.55.4_api.22.1.0
5+
tag = sci.1.56.0_api.23.0.0
66
required = True
77

88
[externals_description]

doc/ChangeLog

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,67 @@
11
===============================================================
2+
Tag name: ctsm5.1.dev091
3+
Originator(s): rgknox (Ryan Knox,rgknox@lbl.gov)
4+
Date: Fri Apr 22 14:11:50 EDT 2022
5+
One-line Summary: clm decomp method is now passed to fates to enabled mimics coupling
6+
7+
Purpose and description of changes
8+
----------------------------------
9+
10+
This is a small changeset, which only adds the passing of a text based flag to FATES, that defines which soil decomposition method is active. This setting is needed by FATES, so that it can pass specific boundary conditions to CLM (and potentially ELM in the future). This change was necessitated because MIMICS requires a Nitrogen to lignin-carbon ratio in the litter flux, yet other decomposition schemes do not. Moreover, the generation of this boundary condition is not trivial, so it is worth it to avoid its computation if mimics is not on. This change should have NO impact on any tests.
11+
12+
13+
Significant changes to scientifically-supported configurations
14+
--------------------------------------------------------------
15+
16+
Does this tag change answers significantly for any of the following physics configurations?
17+
(Details of any changes will be given in the "Answer changes" section below.)
18+
19+
[Put an [X] in the box for any configuration with significant answer changes.]
20+
21+
[ ] clm5_1
22+
23+
[ ] clm5_0
24+
25+
[ ] ctsm5_0-nwp
26+
27+
[ ] clm4_5
28+
29+
30+
Bugs fixed or introduced
31+
------------------------
32+
33+
None
34+
35+
36+
Notes of particular relevance for users
37+
---------------------------------------
38+
39+
None, this does not currently have an affect on any functionality, it simply lays groundwork for FATES-MIMICS coupling. There are no changes to memory usage or run-time.
40+
41+
42+
Notes of particular relevance for developers:
43+
---------------------------------------------
44+
45+
No changes in testing. These changes will enable completion (or progress) on CTSM #1643
46+
47+
Testing summary:
48+
----------------
49+
50+
regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):
51+
52+
cheyenne ---- aux_clm, PASS, b4b against ctsm5.1.dev090
53+
izumi ------- aux_clm, PASS, b4b against ctsm5.1.dev090
54+
55+
56+
Answer changes
57+
--------------
58+
None
59+
60+
Pull Requests that document the changes (include PR ids): #1700
61+
(https://github.com/ESCOMP/ctsm/pull/1700)
62+
63+
===============================================================
64+
===============================================================
265
Tag name: ctsm5.1.dev090
366
Originator(s): samrabin (Sam Rabin)
467
Date: Thu Mar 31 15:03:34 MDT 2022

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.1.dev091 rgknox 04/22/2022 clm decomp method is now passed to fates to enabled mimics coupling
34
ctsm5.1.dev090 samrabin 03/31/2022 Fix misleading name of "gddplant"
45
ctsm5.1.dev089 sacks 03/31/2022 For CLM45 apply peaklai to aleaf in grainfill
56
ctsm5.1.dev088 samrabin 03/28/2022 Add outputs for annual crop sowing and harvest dates

src/utils/clmfates_interfaceMod.F90

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ module CLMFatesInterfaceMod
9494
use decompMod , only : get_proc_bounds, &
9595
get_proc_clumps, &
9696
get_clump_bounds
97+
use SoilBiogeochemDecompCascadeConType , only : mimics_decomp, decomp_method
98+
use SoilBiogeochemDecompCascadeConType , only : no_soil_decomp, century_decomp
9799
use GridCellType , only : grc
98100
use ColumnType , only : col
99101
use LandunitType , only : lun
@@ -298,6 +300,14 @@ subroutine CLMFatesGlobals()
298300
! which has fewer boundary conditions (simpler)
299301
call set_fates_ctrlparms('nu_com',cval='RD')
300302

303+
if (decomp_method == mimics_decomp) then
304+
call set_fates_ctrlparms('decomp_method',cval='MIMICS')
305+
elseif(decomp_method == century_decomp ) then
306+
call set_fates_ctrlparms('decomp_method',cval='CENTURY')
307+
elseif(decomp_method == no_soil_decomp ) then
308+
call set_fates_ctrlparms('decomp_method',cval='NONE')
309+
end if
310+
301311
! These may be in a non-limiting status (ie when supplements)
302312
! are added, but they are always allocated and cycled non-the less
303313
! FATES may want to interact differently with other models

0 commit comments

Comments
 (0)