-
Notifications
You must be signed in to change notification settings - Fork 320
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
Enable new crop calendars for clm60 compsets #2664
Enable new crop calendars for clm60 compsets #2664
Conversation
The latter will be deleted in the next commit.
…lm5_0, and clm5_1.
Avoids issue with undefined pointer to crop_inst%rx_swindow_starts_thisyr_patch and probably other arrays.
Instead of just :. Hopefully will eliminate too-high index errors in threading tests.
Hopefully will eliminate too-high index errors in threading tests.
…-default to crop_calendars suite.
Hopefully will eliminate too-high index errors in threading tests.
Hopefully will eliminate too-high index errors in threading tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@samsrabin I have reviewed this PR and see no problems with it. If I understand correctly, this work sets the stage for bringing in #2593, which we discussed at length a few days ago, right?
Thank you for all this work!
Yes, but not just that! Here's the full list of PRs that have been merged into this development branch before this one: |
- Was: ERS_D.f19_g17.I1850Clm50BgcCrop.izumi_nag.clm-ciso_monthly_matrixcn_spinup - Now: ERS_D.f10_f10_mg37.I1850Clm50BgcCrop.izumi_nag.clm-ciso_monthly_matrixcn_spinup Fixes ESCOMP#2667: Change out a f19 resolution test on Izumi for f10 (ESCOMP#2667)
Tests on Derecho are still going, but merging this to the branch now. We'll work out the tests for the PR to master. |
Description of changes
Enables
cropcals_rx_adapt
by default for clm60.Specific notes
Contributors other than yourself, if any: @slevis-lmwg
Are answers expected to change (and if so in what way)? Yes. Relative to
ctsm5.2.015
:crop
testmod will have answers change due to more frequent writing of the h2 file. Note that this only affects tests.Any User Interface Changes (namelist or namelist defaults changes)?
cropcals_rx
, default false.cropcals_rx_adapt
, default true. This is what changes default behavior.stream_year_first_cropcal
tostream_year_first_cropcal_swindows
stream_year_last_cropcal
tostream_year_last_cropcal_swindows
model_year_align_cropcal
tomodel_year_align_cropcal_swindows
stream_year_first_cropcal_cultivar_gdds
stream_year_last_cropcal_cultivar_gdds
model_year_align_cropcal_cultivar_gdds
stream_fldFileName_gdd20_baseline
stream_gdd20_seasons
(experimental)flush_gdd20
(experimental)stream_fldFileName_gdd20_season_start
(experimental)stream_fldFileName_gdd20_season_end
(experimental)allow_invalid_gdd20_season_inputs
Does this create a need to change or add documentation? Did you do so?
Testing performed
aux_clm
compared toctsm5.2.015
:ctsm5.2.016_cropcals
) at 542f708: 10 run failures. Resubmitted those 10 after changes in 126ce29..2156c72 (/glade/derecho/scratch/samrabin/tests_0726-084119de/
)...ctsm5.2.016
) at 542f708Rerunning both after bug fixes (b1aed3f), comparing to baselines generated above, skipping generate (all should PASS except expected failures):
/glade/derecho/scratch/samrabin/tests_0726-091635de/
/scratch/cluster/samrabin/tests_0726-091602iz/
,/scratch/cluster/samrabin/tests_0726-122439iz
I used the wrong
--compare
for that latest Derecho test suite, so it will have to be checked manually:Python tests (unit, system,
black
,pylint
)✅ pass as of 2156c72.
Namelist build tests
🆗. 4 fail; see #2666.