Skip to content

Merge new crop calendars into master - #2665

Merged
ekluzek merged 218 commits into
masterfrom
scale-maturity-reqs
Jul 28, 2024
Merged

ekluzek merged 218 commits into
masterfrom
scale-maturity-reqs

Conversation

@samsrabin

Copy link
Copy Markdown
Member

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
They're being handled in PlantCrop() instead.

(cherry picked from commit 045b3d7)
(cherry picked from commit 3ae50b7)
Add namelist options for prescribed crop calendars
Allow prescribed gddmaturity to vary based on recent climate (v2)
@samsrabin samsrabin self-assigned this Jul 26, 2024
samsrabin and others added 10 commits July 25, 2024 23:17
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.
Hopefully will eliminate too-high index errors in threading tests.
Hopefully will eliminate too-high index errors in threading tests.
Merge ctsm5.2.015 into scale-maturity-reqs
@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
- 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
Enable new crop calendars for clm60 compsets
@ekluzek

ekluzek commented Jul 26, 2024

Copy link
Copy Markdown
Contributor

@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 left a comment

Copy link
Copy Markdown
Contributor

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.

Comment thread bld/CLMBuildNamelist.pm Resolved
Comment thread bld/CLMBuildNamelist.pm Resolved
Comment thread bld/unit_testers/build-namelist_test.pl Resolved
Comment thread cime_config/testdefs/testlist_clm.xml Resolved
Comment thread cime_config/testdefs/testlist_clm.xml Resolved
@ekluzek

ekluzek commented Jul 28, 2024

Copy link
Copy Markdown
Contributor

Testing finished on Derecho and looks good.

@ekluzek
ekluzek merged commit 95fc92a into master Jul 28, 2024
@ekluzek
ekluzek deleted the scale-maturity-reqs branch October 3, 2024 17:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement new capability or improved behavior of existing capability

Projects

Development

Successfully merging this pull request may close these issues.

2 participants