-
Notifications
You must be signed in to change notification settings - Fork 312
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
Fix harvest-related values on surface datasets for smallville and other cases with all_veg #1019
Merged
billsacks
merged 2 commits into
ESCOMP:master
from
billsacks:smallville_sfcdataset_harvest
May 25, 2020
Merged
Fix harvest-related values on surface datasets for smallville and other cases with all_veg #1019
billsacks
merged 2 commits into
ESCOMP:master
from
billsacks:smallville_sfcdataset_harvest
May 25, 2020
Conversation
This file contains 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
I think it's really ESCOMP#203 that's causing this failure, not ESCOMP#158.
I'm hopeful that this will address ESCOMP#203
billsacks
added
PR status: ready
PR: this is ready to merge in, with all tests satisfactory and reviews complete
next
this should get some attention in the next week or two. Normally each Thursday SE meeting.
and removed
next
this should get some attention in the next week or two. Normally each Thursday SE meeting.
labels
May 21, 2020
@ekluzek gave verbal approval for this. |
With a surface dataset created with this fix, this test finally is passing: |
billsacks
added a commit
that referenced
this pull request
May 25, 2020
Add two bioenergy crops (switchgrass and miscanthus) Main change is from Yanyan Cheng: adding parameters and code for two bioenergy crops, switchgrass and miscanthus. Along with this, there is a new potential flux from crop leaves and stems to the crop product pool at harvest, representing biofuel products; a new pft-specific parameter controls this flux (biofuel_harvfrac). Currently, the out-of-the-box surface datasets do not specify any area for these crops, but the new parameter file will allow them to be present if specified on the surface dataset or landuse_timeseries file. Note that this is only an option for CLM5.0, NOT for CLM4.5. (See #884 for details.) Also, some minor fixes from Bill Sacks: - Resolves #203 - Fixes creation of harvest-related variables on surface datasets created with the all_veg option - smallville, PTCLM, etc. (documented in #1019) - Resolves #930 - Makes gindex_ocn intent(inout) rather than intent(out) - Resolves #1021 - Changes SSP test to only do symlink if needed
ekluzek
added a commit
to jtruesdal/ctsm
that referenced
this pull request
May 27, 2020
Add two bioenergy crops (switchgrass and miscanthus) Main change is from Yanyan Cheng: adding parameters and code for two bioenergy crops, switchgrass and miscanthus. Along with this, there is a new potential flux from crop leaves and stems to the crop product pool at harvest, representing biofuel products; a new pft-specific parameter controls this flux (biofuel_harvfrac). Currently, the out-of-the-box surface datasets do not specify any area for these crops, but the new parameter file will allow them to be present if specified on the surface dataset or landuse_timeseries file. Note that this is only an option for CLM5.0, NOT for CLM4.5. (See ESCOMP#884 for details.) Also, some minor fixes from Bill Sacks: - Resolves ESCOMP#203 - Fixes creation of harvest-related variables on surface datasets created with the all_veg option - smallville, PTCLM, etc. (documented in ESCOMP#1019) - Resolves ESCOMP#930 - Makes gindex_ocn intent(inout) rather than intent(out) - Resolves ESCOMP#1021 - Changes SSP test to only do symlink if needed
ekluzek
added a commit
to ekluzek/CTSM
that referenced
this pull request
Jun 10, 2020
Add two bioenergy crops (switchgrass and miscanthus) Main change is from Yanyan Cheng: adding parameters and code for two bioenergy crops, switchgrass and miscanthus. Along with this, there is a new potential flux from crop leaves and stems to the crop product pool at harvest, representing biofuel products; a new pft-specific parameter controls this flux (biofuel_harvfrac). Currently, the out-of-the-box surface datasets do not specify any area for these crops, but the new parameter file will allow them to be present if specified on the surface dataset or landuse_timeseries file. Note that this is only an option for CLM5.0, NOT for CLM4.5. (See ESCOMP#884 for details.) Also, some minor fixes from Bill Sacks: - Resolves ESCOMP#203 - Fixes creation of harvest-related variables on surface datasets created with the all_veg option - smallville, PTCLM, etc. (documented in ESCOMP#1019) - Resolves ESCOMP#930 - Makes gindex_ocn intent(inout) rather than intent(out) - Resolves ESCOMP#1021 - Changes SSP test to only do symlink if needed
ekluzek
added a commit
to juliusvira/ctsm
that referenced
this pull request
Aug 22, 2022
Add two bioenergy crops (switchgrass and miscanthus) Main change is from Yanyan Cheng: adding parameters and code for two bioenergy crops, switchgrass and miscanthus. Along with this, there is a new potential flux from crop leaves and stems to the crop product pool at harvest, representing biofuel products; a new pft-specific parameter controls this flux (biofuel_harvfrac). Currently, the out-of-the-box surface datasets do not specify any area for these crops, but the new parameter file will allow them to be present if specified on the surface dataset or landuse_timeseries file. Note that this is only an option for CLM5.0, NOT for CLM4.5. (See ESCOMP#884 for details.) Also, some minor fixes from Bill Sacks: - Resolves ESCOMP#203 - Fixes creation of harvest-related variables on surface datasets created with the all_veg option - smallville, PTCLM, etc. (documented in ESCOMP#1019) - Resolves ESCOMP#930 - Makes gindex_ocn intent(inout) rather than intent(out) - Resolves ESCOMP#1021 - Changes SSP test to only do symlink if needed Conflicts: Externals.cfg bld/namelist_files/namelist_defaults_ctsm.xml bld/namelist_files/namelist_definition_ctsm.xml bld/unit_testers/build-namelist_test.pl src/biogeochem/CNBalanceCheckMod.F90 src/biogeochem/CNDriverMod.F90 src/biogeochem/CNVegetationFacade.F90 src/main/clm_driver.F90 src/main/clm_initializeMod.F90 src/main/controlMod.F90
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
PR status: ready
PR: this is ready to merge in, with all tests satisfactory and reviews complete
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
Set harvest-related values to 0 rather than spval when running mksurfdata_map with all_veg = true (for smallville, etc.).
Compared with the baseline, this changes the following fields on the smallville surface dataset, which are all now 0 rather than spval:
Specific notes
Contributors other than yourself, if any: none
CTSM Issues Fixed (include github issue #):
Are answers expected to change (and if so in what way)? Yes, but just for smallville and similar test cases
Any User Interface Changes (namelist or namelist defaults changes)? no
Testing performed, if any: none yet