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 patch count controls #1766

Merged
merged 49 commits into from
Jun 21, 2022
Merged

fates patch count controls #1766

merged 49 commits into from
Jun 21, 2022

Conversation

rgknox
Copy link
Collaborator

@rgknox rgknox commented May 23, 2022

Description of changes

This PR is an API change. Primarily it allows fates to dictate the total number of naturally vegetated patches. If fates is in SP mode, it also ensures that CLM tracks enough patches to accomodate the LAI and height vectors that it needs to pass back. These modifications should move us closer (if not all the way there) to run CFTs as FATES patches as well.

Specific notes

Coupled with FATES PR: 862

Contributors other than yourself, if any:

@ekluzek fates-software-team

CTSM Issues Fixed (include github issue #):
Fixes #1764
Fixes #1762
Fixes #1784

Are answers expected to change (and if so in what way)? No bit-for-bit

Any User Interface Changes (namelist or namelist defaults changes)? New namelist item for fates
use_fates_tree_damage
Some new FATES damage dimensions

Testing performed, if any: regular and fates tests

@glemieux
Copy link
Collaborator

Note: 69bddf4 fixes #1762

@glemieux glemieux linked an issue May 24, 2022 that may be closed by this pull request
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a bunch of comments here, and ask for a bunch of changes. Some are really reverting code in ways that won't matter for your testing. Some are bigger and we should discuss.

bld/namelist_files/namelist_defaults_ctsm.xml Outdated Show resolved Hide resolved
src/biogeochem/EDBGCDynMod.F90 Show resolved Hide resolved
src/biogeochem/SatellitePhenologyMod.F90 Outdated Show resolved Hide resolved
src/main/clm_initializeMod.F90 Outdated Show resolved Hide resolved
src/main/clm_initializeMod.F90 Outdated Show resolved Hide resolved
src/main/clm_varpar.F90 Show resolved Hide resolved
src/main/initGridCellsMod.F90 Outdated Show resolved Hide resolved
src/main/subgridMod.F90 Outdated Show resolved Hide resolved
src/main/surfrdMod.F90 Outdated Show resolved Hide resolved
src/main/surfrdMod.F90 Show resolved Hide resolved
@ekluzek
Copy link
Collaborator

ekluzek commented Jun 15, 2022

@rgknox and I met to go over this, and did some good work to figure this out. Steps forward that we see will be to bring in the PR I added to this PR, and Ryan is also going to work with maxveg and natpft_ub a bit. In the longer term I want to refactor the surfrd part of this, but we'll have me do that part of this.

@ekluzek
Copy link
Collaborator

ekluzek commented Jun 16, 2022

We built a table to show how this works for different FATES modes...

https://docs.google.com/spreadsheets/d/1OJ0eaNVb1AvDOnflrsY_haMoGZR6E4NGE1fMTkxl56c

@ekluzek
Copy link
Collaborator

ekluzek commented Jun 17, 2022

OK, I think this is nearly ready. Things left to do that I see are to merge my dry-dep changes in, and then rerun testing. After that we can merge the FATES changes in, and then do the normal things to turn this into the next CTSM tag ctsm5.1.dev099.

@ekluzek ekluzek merged commit 25a7cd3 into ESCOMP:master Jun 21, 2022
@ekluzek ekluzek deleted the fates-params-api23 branch June 21, 2022 22:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done (non release/external)
3 participants