Make nc3crop and nc3irrig private to pftconMod - #4112
Merged
Conversation
Contributor
|
@adrifoster asked if adding an extral moss PFT is critical for the ABOVE project, as there are unused PFTs for the Arctic sites she's running (which include "tropical trees") and could be adopted for moss. Long-term this is something we'll need, but it's a larger project. @samsrabin would like to bring this PR in, as it's mostly done, which seems appropriate. |
samsrabin
force-pushed
the
allow-new-non-crop-pfts
branch
5 times, most recently
from
July 9, 2026 22:11
ed55e78 to
81c7b3f
Compare
samsrabin
force-pushed
the
allow-new-non-crop-pfts
branch
from
July 10, 2026 15:52
81c7b3f to
509d713
Compare
samsrabin
marked this pull request as draft
July 10, 2026 15:58
samsrabin
commented
Jul 10, 2026
This was referenced Jul 10, 2026
samsrabin
commented
Jul 10, 2026
samsrabin
force-pushed
the
allow-new-non-crop-pfts
branch
from
July 13, 2026 19:17
aba3729 to
893922f
Compare
Used by FireEmisFactorsMod fire_emis_factors_get() to avoid that function needing access to nc3crop.
samsrabin
force-pushed
the
allow-new-non-crop-pfts
branch
from
July 13, 2026 19:19
893922f to
e6a9938
Compare
File needs to have at least one entry for every natural PFT, plus one more to be used for crops.
Specifically, the indices of rainfed and irrigated CFTs used by surfrdUtilsMod, as well as the indices of all CFTs used by handle_too_short_fire_emis_factor_file().
samsrabin
force-pushed
the
allow-new-non-crop-pfts
branch
from
July 15, 2026 15:10
558fca0 to
922a6aa
Compare
samsrabin
marked this pull request as ready for review
July 16, 2026 19:46
slevis-lmwg
self-requested a review
July 16, 2026 21:29
slevis-lmwg
approved these changes
Jul 16, 2026
slevis-lmwg
left a comment
Contributor
There was a problem hiding this comment.
Approving preemptively but asking for a guided tour of a few items. Thanks @samsrabin :-)
This was referenced Jul 27, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
As part of our goal to make our code agnostic to the ordering of PFTs (#21) and avoid hard-coded PFT properties (#3388), this PR makes the
nc3cropandnc3irrigvariables (PFT indices for the generic crops) private topftconMod.Specific notes
Contributors other than yourself, if any: None
CTSM issues resolved or otherwise addressed, if any:
Any user interface changes (namelist or namelist defaults changes)? No
Testing planned or performed, if any:
aux_clmfates(just to make sure some new variables I added aren't ever needed under FATES)SMS_Ln9_P256x3.f19_g17.IHistClm50Sp.derecho_intel.clm-waccmx_offline2005Start,SMS_Lm1.f19_g17.I1850Clm60BgcCropCmip6waccm.derecho_intel.clm-basic,SMS_Lm1.f10_f10_mg37.I1850Clm60BgcCropCmip6waccm.derecho_gnu.clm-basicRequirements before merge: