-
Notifications
You must be signed in to change notification settings - Fork 312
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'bioenergy_ctsm1.0.dev080'
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
- Loading branch information
Showing
30 changed files
with
632 additions
and
137 deletions.
There are no files selected for viewing
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
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
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
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
1 change: 0 additions & 1 deletion
1
cime_config/testdefs/testmods_dirs/clm/cropColdStart/include_user_mods
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
cime_config/testdefs/testmods_dirs/clm/cropColdStart/shell_commands
This file was deleted.
Oops, something went wrong.
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
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
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
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
Oops, something went wrong.