[WIP] Make nc3crop and nc3irrig private to pftconMod#4112
Conversation
|
@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. |
ed55e78 to
81c7b3f
Compare
Used by FireEmisFactorsMod fire_emis_factors_get() to avoid that function needing access to nc3crop.
81c7b3f to
509d713
Compare
| if ( (n_pfts < maxveg) .and. (n_pfts < nc3crop) )then | ||
| write(iulog,*) ' n_pfts = ', n_pfts, ' maxveg = ', maxveg, ' nat_pft = ', nc3crop | ||
| if (n_pfts < num_pfts_possible_natural) then | ||
| write(iulog,*) ' n_pfts = ', n_pfts, ' num_pfts_possible_natural = ', num_pfts_possible_natural |
There was a problem hiding this comment.
This is the change that I'm most unsure about. One thing was easy: The original could be simplified from
if ( (n_pfts < maxveg) .and. (n_pfts < nc3crop) )thento
if (n_pfts < nc3crop) thenwithout issue, because nc3crop is always ≤ maxveg. But then, is n_pfts < num_pfts_possible_natural equivalent to n_pfts < nc3crop?
I will add a check in pftconMod for this during testing, which I will make sure to remove before merge.
There was a problem hiding this comment.
All changes in this file are from renaming num_cfts_possible to num_prognostic_cfts_possible, which more clearly describes its meaning.
WORK IN PROGRESS; SUBJECT TO FORCE PUSHES; DO NOT REVIEW
Description of changes
As part of our goal to make our code agnostic to the ordering of PFTs (see #21; #3388), this PR makes the
nc3cropandnc3irrigvariables (PFT indices for the generic crops) private topftconMod.Remaining work
num_pfts_possible_natural==nc3cropSpecific 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_clmctsm_sci(changes to how some bits in the fire emissions code work)fates(just to make sure some new variables I added aren't ever needed under FATES)Requirements before merge: