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

Fix RXCROPMATURITY test #2599

Merged
merged 20 commits into from
Jun 19, 2024
Merged

Conversation

samsrabin
Copy link
Collaborator

@samsrabin samsrabin commented Jun 14, 2024

Description of changes

Copies a file from one case directory to another, fixing the RXCROPMATURITY test. Also adds a shorter version of that, RXCROPMATURITYSKIPGEN, which is useful for testing. It's short enough that I've added it as a new test in aux_clm, so now we have some coverage of the RXCROPMATURITY stuff.

Specific notes

Contributors other than yourself, if any: None

CTSM Issues Fixed:

Are answers expected to change (and if so in what way)? No

Any User Interface Changes (namelist or namelist defaults changes)? No

Does this create a need to change or add documentation? Did you do so? No

Testing performed, if any:

  • ✅ All Python tests pass, except pylint, which complains about a file I didn't touch.
  • ✅ New aux_clm test passes (RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput).
  • ctsm_sci test in progress (RXCROPMATURITY_Lm61.f09_g17.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput).
  • ✅ Coarser (10x15) version of above test passes (RXCROPMATURITY_Lm61.f10_f10_mg37.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput).

Useful for troubleshooting:
* RXCROPMATURITYSKIPRUN skips the build and run phases.
* RXCROPMATURITYSKIPBUILD just skips the build phase. It still does the run phase so as to test everything before actual run submission.
@samsrabin samsrabin added the testing additions or changes to tests label Jun 14, 2024
@samsrabin samsrabin changed the base branch from master to b4b-dev June 14, 2024 15:36
@samsrabin samsrabin changed the title Fix RXCROPMATURITY test [WIP] Fix RXCROPMATURITY test Jun 14, 2024
@samsrabin samsrabin force-pushed the fix-rxcropmaturity branch 3 times, most recently from b018060 to 72f1194 Compare June 14, 2024 21:54
Also adds rxcropmaturity test suite with that and a coarse version of the existing RXCROPMATURITY test. So:
* RXCROPMATURITY_Lm61.f10_f10_mg37.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput
* RXCROPMATURITYSKIPGEN_Ld1097.f10_f10_mg37.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput
@samsrabin samsrabin changed the title [WIP] Fix RXCROPMATURITY test Fix RXCROPMATURITY test Jun 16, 2024
@samsrabin samsrabin requested a review from ekluzek June 16, 2024 14:50
@samsrabin samsrabin self-assigned this Jun 16, 2024
@samsrabin samsrabin marked this pull request as ready for review June 16, 2024 15:07
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 great. I love that you are not only fixing the issue, but also bringing in some new testing that is likely to catch issues sooner.

There's a few questions I have, and some changes I ask for. One is potentially bigger if it does make sense, but that could be done by opening an issue and working on it later.

If it would be beneficial to meet, that's also something we could do.

cime_config/SystemTests/rxcropmaturity.py Outdated Show resolved Hide resolved
cime_config/SystemTests/rxcropmaturity.py Show resolved Hide resolved
cime_config/testdefs/testlist_clm.xml Show resolved Hide resolved
python/ctsm/crop_calendars/check_rx_obeyed.py Outdated Show resolved Hide resolved
python/ctsm/crop_calendars/check_rx_obeyed.py Show resolved Hide resolved
@samsrabin samsrabin merged commit 872f65a into ESCOMP:b4b-dev Jun 19, 2024
2 checks passed
slevis-lmwg added a commit to slevis-lmwg/ctsm that referenced this pull request Jun 21, 2024
…20240620

Merge b4bdev 20240620

Fix long names ESCOMP#2512
Dust emissions moved to Object Oriented design ESCOMP#2552
Fix RXCROPMATURITY test ESCOMP#2599

NB: This will be the first tag in branch tmp-240620 in a series of temporary tags while we wait for the completion of the beta01 cesm tag.
ekluzek added a commit to ekluzek/CTSM that referenced this pull request Jun 21, 2024
…ximod

Merge b4bdev 20240620

Fix long names ESCOMP#2512
Dust emissions moved to Object Oriented design ESCOMP#2552
Fix RXCROPMATURITY test ESCOMP#2599

NB: This will be the first tag in branch tmp-240620 in a series of temporary tags while we wait for the completion of the beta01 cesm tag.

 Conflicts:
	doc/ChangeLog
	doc/ChangeSum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
testing additions or changes to tests
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

RXCROPMATURITY_Lm61.f09_g17.IHistClm50BgcCrop.derecho_intel.clm-cropMonthOutput fails in ctsm5.1.dev175
2 participants