Skip to content

Rework crop_calendars suite and cropMonthOutput#2676

Merged
samsrabin merged 11 commits intoESCOMP:masterfrom
samsrabin:fix-nag-bld-2659
Aug 14, 2024
Merged

Rework crop_calendars suite and cropMonthOutput#2676
samsrabin merged 11 commits intoESCOMP:masterfrom
samsrabin:fix-nag-bld-2659

Conversation

@samsrabin
Copy link
Member

@samsrabin samsrabin commented Aug 8, 2024

Description of changes

  • Changes cropMonthOutput so that h2 files are actually monthly instead of daily
  • Changes a nag test to use debug mode (fixing a build error) and run for shorter (fixing cputime exceedance)
  • Reworks RxCropCals* testmods to not include crop testmod

Specific notes

Contributors other than yourself, if any: None

CTSM Issues Fixed (include github issue #):

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

  • All cropMonthOutput tests will now have monthly h2 files instead of daily
  • Most 25-month RxCropCals* tests are changed to 733 days; one changed to 65 days

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:

  • Affected tests all tested and behave as expected
  • aux_clm passes for all tests except the ones I expect changes in (or are missing baselines)—waiting until ready in queue.

Previously: SMS_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI
Now:        SMS_D_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI
Specifying hist_nhtfrq(3) seems to override later specification of h2 in "hist_nhtfrq = 0,-240,0"
SMS_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI
@samsrabin samsrabin added bug something is working incorrectly next this should get some attention in the next week or two. Normally each Thursday SE meeting. labels Aug 8, 2024
@samsrabin samsrabin added this to the cesm3.0.0 release branch tag milestone Aug 8, 2024
@samsrabin samsrabin self-assigned this Aug 8, 2024
@samsrabin
Copy link
Member Author

@ekluzek I ended up finding issues that make it so this can't go onto b4b-dev, as we had decided on #2659.

@wwieder wwieder added PR status: awaiting review Work on this PR is paused while waiting for review. and removed next this should get some attention in the next week or two. Normally each Thursday SE meeting. labels Aug 8, 2024
@wwieder wwieder requested a review from slevis-lmwg August 8, 2024 16:12
@wwieder
Copy link
Contributor

wwieder commented Aug 8, 2024

@slevis-lmwg can you review this PR?

Copy link
Contributor

@slevis-lmwg slevis-lmwg left a comment

Choose a reason for hiding this comment

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

@samsrabin @wwieder this looks good to me.

@samsrabin samsrabin added PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete and removed PR status: awaiting review Work on this PR is paused while waiting for review. labels Aug 8, 2024
@samsrabin
Copy link
Member Author

Great, thanks!

samsrabin and others added 2 commits August 13, 2024 16:08
Adding on-the-fly parameter settings for prescribed N and P in FATES
@samsrabin samsrabin merged commit 1653e40 into ESCOMP:master Aug 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug something is working incorrectly PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete

Projects

Status: Done (non release/external)

Development

Successfully merging this pull request may close these issues.

Test build failure: SMS_P128x1_Lm25.f10_f10_mg37.IHistClm60BgcCrop.izumi_nag.clm-RxCropCalsAdaptGGCMI

3 participants