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.

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

Move fix for transient non-crop to release-clm5.0 branch #552

Merged
merged 15 commits into from
Oct 30, 2018

Conversation

ekluzek
Copy link
Collaborator

@ekluzek ekluzek commented Oct 29, 2018

Description of changes

Move changes from ctsm1.0.dev013 to release-clm5.0 branch. This is the fix for transient non-crop simulations.

Specific notes

Contributors other than yourself, if any: none

CTSM Issues Fixed (include github issue #): #538

Are answers expected to change (and if so in what way)? Yes (for non-crop clm45/clm50 transient cases)
Currently generic crop areas stay at 1850 levels. This fix allows them to change as they should.

Any User Interface Changes (namelist or namelist defaults changes)? Just for mksurfdata.pl

Testing performed, if any: None now (but was done on master) will be repeated before accepted.

NOTE: Be sure to check your Coding style against the standard:
https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines

billsacks and others added 14 commits October 29, 2018 10:28
Fix associated with issue ESCOMP#538.
Minor code mods that allow %cft to advance beyond 1850 in transient pft
simulations.
Changing the default logic in CLMBuildNamelist.pm instead of hardwiring
do_transient_crops to always equal do_transient_pfts in the code.

This fix as is may be incomplete. It allows do_transient_crops = .true.
when use_crop = .false. but it does not make sure
do_transient_crops = do _transient_pfts.
…_transient consistency, grainproduct, and create_crop_landunit
@ekluzek ekluzek added severity: critical priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete labels Oct 29, 2018
@ekluzek ekluzek added this to the cesm2.1.0 milestone Oct 29, 2018
@ekluzek ekluzek self-assigned this Oct 29, 2018
@ekluzek
Copy link
Collaborator Author

ekluzek commented Oct 30, 2018

Testing as expected:

================================================================================
These tests compare different to the baseline
================================================================================
ERP_D.f10_f10_musgs.IHistClm50Bgc.cheyenne_gnu.clm-decStart
ERP_D.f10_f10_musgs.IHistClm50Bgc.cheyenne_intel.clm-decStart
ERP_D_Ld5.f09_g17.I2000Clm50Vic.cheyenne_intel.clm-vrtlay (missing baseline)
ERP_D_Ld5.f19_g17.IHistClm50Bgc.cheyenne_intel.clm-drydepnomegan
ERP_P36x2_D_Ld5.f10_f10_musgs.IHistClm45BgcCruGs.cheyenne_intel.clm-decStart
ERP_P36x2_Lm13.f10_f10_musgs.IHistClm50Bgc.cheyenne_gnu.clm-monthly
ERP_P36x2_Lm13.f10_f10_musgs.IHistClm50Bgc.cheyenne_intel.clm-monthly
ERS_D_Ld10.f10_f10_musgs.IHistClm50SpG.cheyenne_intel.clm-glcMEC_decrease
SMS_D_Ly2.1x1_brazil.IHistClm50BgcQianGs.cheyenne_intel.clm-ciso_bombspike1963
SMS_Ld5.f19_g17.IHistClm50Bgc.cheyenne_intel.clm-decStart
SMS_Ly1_Mmpi-serial.1x1_brazil.IHistClm50BgcQianGs.cheyenne_gnu.clm-output_bgc_highfreq
================================================================================
These tests failed
================================================================================
ERP_D_Ld10_P36x2.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_decStart		EXPECTED
ERS_D_Ln9_P480x3.f19_g16.I2000Clm50SpGs.cheyenne_intel.clm-waccmx_offline		EXPECTED
ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_gnu.clm-monthly		EXPECTED
ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropGs.cheyenne_intel.clm-monthly		EXPECTED

================================================================================
These tests compare different to the baseline
================================================================================
ERP_D_P48x1.f10_f10_musgs.IHistClm50Bgc.hobart_nag.clm-decStart
SMS_Ld5_D_P48x1.f10_f10_musgs.IHistClm50Bgc.hobart_nag.clm-decStart
SMS_Ld5_D_P48x1.f10_f10_musgs.IHistClm50Bgc.hobart_nag.clm-monthly
================================================================================
These tests failed
================================================================================
SMS.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop		EXPECTED
SMS_D.f10_f10_musgs.I2000Clm50BgcCrop.hobart_pgi.clm-crop		EXPECTED

@ekluzek ekluzek merged commit e96e09e into ESCOMP:release-clm5.0 Oct 30, 2018
@ekluzek ekluzek deleted the transcrop2rel branch October 30, 2018 16:52
mariuslam pushed a commit to NordicESMhub/ctsm that referenced this pull request Aug 26, 2019
…nfsc-fix

litter_moisture initialization fix
AGonzalezNicolas pushed a commit to HPSCTerrSys/clm5_0 that referenced this pull request Jun 27, 2024
Move fix for transient non-crop to release-clm5.0 branch
AGonzalezNicolas pushed a commit to HPSCTerrSys/clm5_0 that referenced this pull request Jul 5, 2024
Move fix for transient non-crop to release-clm5.0 branch
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 priority: high High priority to fix/merge soon, e.g., because it is a problem in important configurations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants