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.

Sign up for GitHub

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

Jump to bottom

Fix harvest-related values on surface datasets for smallville and other cases with all_veg #1019

Merged
merged 2 commits into from
May 25, 2020
Merged

Fix harvest-related values on surface datasets for smallville and other cases with all_veg #1019

merged 2 commits into from
May 25, 2020

Conversation

billsacks
Copy link
Member

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:

 RMS CONST_HARVEST_VH1                1.0000E+36            NORMALIZED  2.0000E+00
 RMS CONST_HARVEST_VH2                1.0000E+36            NORMALIZED  2.0000E+00
 RMS CONST_HARVEST_SH1                1.0000E+36            NORMALIZED  2.0000E+00
 RMS CONST_HARVEST_SH2                1.0000E+36            NORMALIZED  2.0000E+00
 RMS CONST_HARVEST_SH3                1.0000E+36            NORMALIZED  2.0000E+00
 RMS CONST_GRAZING                    1.0000E+36            NORMALIZED  2.0000E+00
 RMS CONST_FERTNITRO_CFT              1.0000E+36            NORMALIZED  2.0000E+00
 RMS UNREPRESENTED_PFT_LULCC          1.0000E+36            NORMALIZED  2.0000E+00
 RMS UNREPRESENTED_CFT_LULCC          1.0000E+36            NORMALIZED  2.0000E+00

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

@billsacks billsacks self-assigned this May 21, 2020
@billsacks billsacks requested a review from ekluzek May 21, 2020 14:59
@billsacks 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
@billsacks billsacks removed the request for review from ekluzek May 21, 2020 16:07
@billsacks
Copy link
Member Author

@ekluzek gave verbal approval for this.

@billsacks
Copy link
Member Author

With a surface dataset created with this fix, this test finally is passing: ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianGs.cheyenne_gnu.clm-monthly

@billsacks billsacks merged commit 633be0e into ESCOMP:master May 25, 2020
billsacks added a commit that referenced this pull request May 25, 2020
@billsacks
Merge branch 'bioenergy_ctsm1.0.dev080'
6ec6e0a 
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
@billsacks billsacks deleted the smallville_sfcdataset_harvest branch May 25, 2020 21:51
ekluzek added a commit to jtruesdal/ctsm that referenced this pull request May 27, 2020
@ekluzek
Merge tag 'ctsm1.0.dev097' into fv3port
6c521ba 
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
@ekluzek
Merge tag 'ctsm1.0.dev097' into simb4b
be3e551 
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
@ekluzek
Merge tag 'ctsm1.0.dev097' into fan-2019-ctsm
1646e04 
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
Reviewers
No reviews
Assignees

@billsacks billsacks

Labels
PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@billsacks