Skip to content
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.

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

FATES parteh scale fixes api (ie nutrient + methane coupling) #1371

Merged
merged 22 commits into from
May 27, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
7ea1621
initial work towards decentralizing history updates in fates, updatin…
rgknox Apr 7, 2021
d4301e8
updated arguments to init_site_vars in fates
rgknox Apr 10, 2021
499a05e
Merge branch 'master' into fates_parteh_scale_fixes_api_thawdepth
rgknox May 5, 2021
89d9916
Updated intitial thaw depth bc to fates to be soil depth
rgknox May 5, 2021
e1517ba
Added interface flag to fates about ch4 module status
rgknox May 5, 2021
16edebd
first pass at converting ch4mod to be coupled with fates
rgknox May 5, 2021
695ac62
updating compatibility with FATES-CH4 code
rgknox May 5, 2021
9b34715
fixes for fates ch4 coupling
rgknox May 6, 2021
8f51ee6
fix to fates cold initialization of thaw depth
rgknox May 6, 2021
bf35807
Updated FATES hash pointer to the testing branch
rgknox May 10, 2021
7e5eb98
Added fates-ch4 test
rgknox May 11, 2021
98e0229
renamed testmoddir folder from FatesCH4 to FatesColdDefCH4 to be cons…
rgknox May 13, 2021
1faadcb
Updated FatesCH4 to base off of FatesColdDef. Changed CH4 tests to be…
rgknox May 14, 2021
7dc898a
Addressing review comments
rgknox May 22, 2021
cbe382b
Resolve merge
rgknox May 22, 2021
49608ca
Update fates tag temporarily to rgknox repo (for testing)
rgknox May 22, 2021
e885111
Merge branch 'ctsm5.1.dev039-branch' into fates_parteh_scale_fixes_ap…
rgknox May 22, 2021
1c247db
Updating temporary external fates hash to include bc_in_ptr removals
May 25, 2021
89bd79b
Merge branch 'ctsm5.1.dev040-branch' into fates_parteh_scale_fixes_ap…
May 25, 2021
6d828ff
Updated fates external from test hash to new tag
rgknox May 26, 2021
6b07337
Update changelog
rgknox May 26, 2021
ddd92ea
Update change files
ekluzek May 27, 2021
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 Externals_CLM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
local_path = src/fates
protocol = git
repo_url = https://github.com/NGEET/fates
tag = sci.1.45.0_api.15.0.0
tag = sci.1.46.0_api.16.0.0
required = True

[PTCLM]
Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- FATES default parameter file -->
<!-- ================================================================== -->

<fates_paramfile>lnd/clm2/paramdata/fates_params_api.14.0.0_12pft_c200921.nc</fates_paramfile>
<fates_paramfile>lnd/clm2/paramdata/fates_params_api.15.1.0_12pft_c210505.nc </fates_paramfile>

<!-- ======================================================================================== -->
<!-- clm 5.0 BGC nitrogen model -->
Expand Down
14 changes: 13 additions & 1 deletion cime_config/testdefs/testlist_clm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2326,7 +2326,19 @@
<option name="comment">Short ERP debug FATES test for single site grid with serial mpi.</option>
</options>
</test>
<test name="SMS_Lm3_D_Mmpi-serial" grid="1x1_brazil" compset="I2000Clm50FatesCru" testmods="clm/FatesHydro">
<test name="ERS_Ld9" grid="f10_f10_mg37" compset="I2000Clm50FatesCru" testmods="clm/FatesColdDefCH4">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<machine name="hobart" compiler="nag" category="fates"/>
<machine name="lawrencium-lr3" compiler="intel" category="fates"/>
<machine name="cheyenne" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:10:00</option>
<option name="comment">30 day exact restart test activating FATES and CH4 f10 grid.</option>
</options>
</test>
<test name="SMS_Lm3_D_Mmpi-serial" grid="1x1_brazil" compset="I2000Clm50FatesCru" testmods="clm/FatesHydro">
<machines>
<machine name="cheyenne" compiler="intel" category="fates"/>
<machine name="izumi" compiler="nag" category="fates"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../FatesColdDef
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
use_lch4 = .true.
89 changes: 89 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,92 @@
===============================================================
Tag name: ctsm5.1.dev041
Originator(s): Ryan Knox
Date: Thu May 27 01:10:40 MDT 2021
One-line Summary: Updates to coupling interface to enable FATES-CH4, and to be compatible with FATES-CNP.

Purpose and description of changes
----------------------------------

These changes are only relegated to the API with FATES. Boundary conditions were prepared within
FATES to enable proper use of the methane model. Further, some minor changes were made to the FATES
interface code (clmfates_interfaceMod.F90) allowing compatibility with FATES tag sci.1.46.0_api.16.0.0
(https://github.com/NGEET/fates/releases/tag/sci.1.46.0_api.16.0.0). Most of these changes have to do
with how the FATES history interface is instantiated.

Significant changes to scientifically-supported configurations
--------------------------------------------------------------

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed or introduced
------------------------

No bugs fixed or introduced.


Notes of particular relevance for users
---------------------------------------

This tag brings compatibility with FATES tag: sci.1.46.0_api.16.0.0

CTSM-FATES users should also be aware that the FATES parameter file has been
updated. An example is found here:

https://github.com/NGEET/fates/blob/sci.1.46.0_api.16.0.0/parameter_files/fates_params_default.cdl

Notes of particular relevance for developers:
---------------------------------------------

A new test was added to check FATES-CH4 coupling:

ERS_Ld9.f10_f10_mg37.I2000Clm50FatesCru.cheyenne_intel.clm-FatesColdDefCH4


Testing summary:
----------------

build-namelist tests (if CLMBuildNamelist.pm has changed):

cheyenne - PASS (60 test different because of fates paramfile)

python testing (if python code has changed; see instructions in python/README.md; document testing done):

cheyenne - PASS

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

cheyenne ---- OK
izumi ------- OK

fates tests:
cheyenne ---- OK


Answer changes
--------------

Changes answers relative to baseline:

All FATES tests will have different answers with tag: sci.1.46.0_api.16.0.0

This is mostly due to the passing of thaw-depth into more of the rooting depth algorithm.

List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): fates
fates to sci.1.46.0_api.16.0.0

Pull Requests that document the changes (include PR ids): #1371
(https://github.com/ESCOMP/ctsm/pull)
#1371 -- FATES parteh scale fixes api (ie nutrient + methane coupling)

===============================================================

===============================================================
Tag name: ctsm5.1.dev040
Originator(s): slevis (Samuel Levis,SLevis Consulting,303-665-1310)
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.1.dev041 rgknox 05/27/2021 bring FATES API up to sci.1.46.0_api.16.0.0 (methane and cn hooks)
ctsm5.1.dev040 slevis 05/20/2021 mksurfdata_map: replace SRC files of various masks with SRC files w no mask
ctsm5.1.dev039 jedwards 05/18/2021 Add NEON sites
ctsm5.1.dev038 erik 04/27/2021 Bring in minor changes from the cesm2.2.0 release tag
Expand Down
Loading