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

Merge new crop calendars into master #2665

Merged
merged 218 commits into from
Jul 28, 2024
Merged

Merge new crop calendars into master #2665

merged 218 commits into from
Jul 28, 2024

Conversation

samsrabin
Copy link
Collaborator

Description of changes

#2664 is the last PR on the scale-maturity-reqs branch. After that's done, this one will merge that branch into master. No changes should be necessary. See that PR for details.

samsrabin and others added 30 commits May 28, 2024 09:33
@samsrabin
Break up a long line.
51d9f09
@samsrabin
use_cropcal_rx_cultivar_gdds not needed in CropPhenology().
c763d66
@samsrabin
PlantCrop(): Be strict about PFT identification.
846f1cc
@samsrabin
PlantCrop: Get gdd20 before setting gddmaturity.
5b056b7
@samsrabin
Correct a comment.
08906bb
@samsrabin
Remove a troubleshooting write to iulog.
6ef52cd
@samsrabin
Optionally adjust rx maturity reqt based on recent climate.
98f68e7
@samsrabin
Don't adapt rx cultivar gdd reqts if baseline gdd20 is ≤0.
b73bcfd
@samsrabin
Ignore 'invalid' values in stream_fldFileName_gdd20_baseline on read.
20f32c1 
They're being handled in PlantCrop() instead.

(cherry picked from commit 045b3d7)
@samsrabin
Add generate_gdd20_baseline tool.
a7cd057 
(cherry picked from commit 3ae50b7)
@samsrabin
Format generate_gdd20_baseline.py with black.
fd5f177
@samsrabin
Add previous commit to .git-blame-ignore-revs.
5eafae7
@samsrabin
Add testmods RxCropCals, RxCropCalsAdapt.
38d6888
@samsrabin
Add cropcals_rx namelist boolean.
317f77d
@samsrabin
CLMBuildNamelist: Fix logic and message for check of sowing window st…
81380ef 
…art/end files.
@samsrabin
CLMBuildNamelist: Use &string_is_undef_or_empty() instead of comparin…
b195734 
…g to ''.
@samsrabin
CLMBuildNamelist: Use &value_is_true() instead of comparing to '.true.'
4b18a5b
@samsrabin
CLMBuildNamelist: Update setup_logic_cropcal_streams() with cropcals_rx.
e76fbbc
@samsrabin
Bugfix: cropcalStreamMod now handles cropcals_rx.
0f729d8
@samsrabin
Update RxCropCals testmod to use cropcals_rx true.
74411ea
@samsrabin
Add RxCropCals and RxCropCalsAdapt tests to new suite crop_calendars.
9d1f88d
@samsrabin
Add cropcals_rx_adapt option.
7e5257a
@samsrabin
Move add_default() of model_year_align_cropcal to be with other year …
5911cea 
…params.
@samsrabin
Merge pull request #6 from samsrabin/scale-mat-reqs-pr1.1-nml
ccc228c 
Add namelist options for prescribed crop calendars
@samsrabin
Split streams year params for swindows vs maturity reqts.
d89cb9d
@samsrabin
Explain hard-coding of 2000 when reading GDD20 baseline file.
eb27a2d
@samsrabin
Merge pull request #2560 from samsrabin/scale-mat-reqs-5.2.005
a09d72c 
Allow prescribed gddmaturity to vary based on recent climate (v2)
@samsrabin
Functionize UpdateAccVars_CropGDDs().
75d7df6
@samsrabin
Optionally read/use gdd20 accum seasons from stream files.
45aff29
@samsrabin
Fix check of invalid swindow inputs.
0feff1f
@samsrabin samsrabin self-assigned this Jul 26, 2024
samsrabin and others added 10 commits July 25, 2024 23:17
@samsrabin
Update ChangeLog and ChangeSum.
af02bca
@samsrabin
Wrap cropcal subroutine calls in use_crop.
542f708 
Avoids issue with undefined pointer to crop_inst%rx_swindow_starts_thisyr_patch and probably other arrays.
@samsrabin
Allocate first dim on dataptr2d_*_start/end arrays with begp:endp.
126ce29 
Instead of just :. Hopefully will eliminate too-high index errors in threading tests.
@samsrabin
Allocate 2d arrays with begp:endp, not lsize.
b7a8fb5 
Hopefully will eliminate too-high index errors in threading tests.
@samsrabin
Add ERP_D_Ld10_P64x2.f10_f10_mg37.IHistClm60BgcCrop.derecho_intel.clm…
63b66b6 
…-default to crop_calendars suite.
@samsrabin
dataptr2d arrays' first dim is gridcell, not patch.
7e04126 
Hopefully will eliminate too-high index errors in threading tests.
@samsrabin
Use begg and endg instead of lsize.
d47b28a 
Hopefully will eliminate too-high index errors in threading tests.
@samsrabin
Use begg/endg instead of referring to bounds%.
2156c72
@samsrabin
Merge pull request #2661 from samsrabin/scale-mat-reqs-pr3-mergemaster
3631dc9 
Merge ctsm5.2.015 into scale-maturity-reqs
@samsrabin
Update ChangeLog and ChangeSum.
b1aed3f
@samsrabin samsrabin closed this Jul 26, 2024
@samsrabin samsrabin reopened this Jul 26, 2024
@ekluzek ekluzek marked this pull request as ready for review July 26, 2024 17:23
@samsrabin
Changes one Izumi test from f19 to 10x15 resolution.
66e28d1 
- 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 #2667: Change out a f19 resolution test on Izumi for f10 (#2667)
@samsrabin samsrabin added the enhancement new capability or improved behavior of existing capability label Jul 26, 2024
@samsrabin samsrabin added this to the CESM3 Capability Freeze milestone Jul 26, 2024
@ekluzek
Merge pull request #2664 from samsrabin/scale-mat-reqs-pr4-makedefault
2713766 
Enable new crop calendars for clm60 compsets
@ekluzek
Copy link
Collaborator

ekluzek commented Jul 26, 2024

@slevis-lmwg and I met about finishing this out. We confirmed Izumi tests are as expected and finished.

Tests on Derecho are still going. Ill check on them tomorrow, and make sure they are all good, and resubmit anything needed if there's a couple fails because of a glitch so that we have good baselines. So I expect to finish the tag for this tomorrow.

@samsrabin samsrabin closed this Jul 27, 2024
@samsrabin samsrabin reopened this Jul 27, 2024
@ekluzek ekluzek mentioned this pull request Jul 27, 2024
Open
ekluzek
ekluzek approved these changes Jul 28, 2024
View reviewed changes
Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is awesome to see coming in. So glad to see it come in by the chill deadline.

I noticed a couple things that I made issues for or added to issues.

bld/CLMBuildNamelist.pm Show resolved Hide resolved
bld/CLMBuildNamelist.pm Show resolved Hide resolved
bld/namelist_files/namelist_defaults_ctsm.xml Show resolved Hide resolved
bld/namelist_files/namelist_defaults_ctsm.xml Show resolved Hide resolved
bld/unit_testers/build-namelist_test.pl Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Show resolved Hide resolved
cime_config/testdefs/testmods_dirs/clm/decStart/README Show resolved Hide resolved
doc/source/users_guide/running-special-cases/Running-with-custom-crop-calendars.rst Show resolved Hide resolved
@ekluzek
Copy link
Collaborator

ekluzek commented Jul 28, 2024

Testing finished on Derecho and looks good.

@ekluzek ekluzek merged commit 95fc92a into master Jul 28, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekluzek ekluzek ekluzek approved these changes

Assignees

@samsrabin samsrabin

Labels
enhancement new capability or improved behavior of existing capability
Projects
CTSM: Crop enhancements
Status: Done
Milestone
CESM3 Capability Freeze
Development

Successfully merging this pull request may close these issues.
2 participants
@samsrabin @ekluzek