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

Enable new crop calendars for clm60 compsets #2664

Merged

Conversation

samsrabin
Copy link
Collaborator

@samsrabin samsrabin commented Jul 26, 2024

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:

  • Any clm6 compset with crops enabled, except maybe very short runs where no planting has time to occur with either crop calendar setup.
  • Any test that uses or inherits the crop testmod will have answers change due to more frequent writing of the h2 file. Note that this only affects tests.
  • Most, if not all, tests will have namelist differences.

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

  • Add cropcals_rx, default false.
  • Add cropcals_rx_adapt, default true. This is what changes default behavior.
  • Rename stream_year_first_cropcal to stream_year_first_cropcal_swindows
  • Rename stream_year_last_cropcal to stream_year_last_cropcal_swindows
  • Rename model_year_align_cropcal to model_year_align_cropcal_swindows
  • Add stream_year_first_cropcal_cultivar_gdds
  • Add stream_year_last_cropcal_cultivar_gdds
  • Add model_year_align_cropcal_cultivar_gdds
  • Add stream_fldFileName_gdd20_baseline
  • Add stream_gdd20_seasons (experimental)
  • Add flush_gdd20 (experimental)
  • Add stream_fldFileName_gdd20_season_start (experimental)
  • Add stream_fldFileName_gdd20_season_end (experimental)
  • Add allow_invalid_gdd20_season_inputs

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

  • Yes
  • No

Testing performed

aux_clm compared to ctsm5.2.015:

  • Derecho ❌ (baseline named ctsm5.2.016_cropcals) at 542f708: 10 run failures. Resubmitted those 10 after changes in 126ce29..2156c72 (/glade/derecho/scratch/samrabin/tests_0726-084119de/)...
  • Izumi ✅ (baseline named ctsm5.2.016) at 542f708

Rerunning both after bug fixes (b1aed3f), comparing to baselines generated above, skipping generate (all should PASS except expected failures):

  • Derecho ⏳: /glade/derecho/scratch/samrabin/tests_0726-091635de/
  • Izumi ✅: /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:

cd ~samrabin/ctsm_scale-mat-reqs-pr4-makedefault

cime/CIME/Tools/compare_test_results \
-b ctsm5.2.016_cropcals \
--baseline-root /glade/campaign/cgd/tss/ctsm_baselines \
-r /glade/derecho/scratch/samrabin/tests_0726-091635de

Python tests (unit, system, black, pylint)

✅ pass as of 2156c72.

Namelist build tests

🆗. 4 fail; see #2666.

samsrabin and others added 3 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.
@samsrabin samsrabin closed this Jul 26, 2024
@samsrabin samsrabin reopened this Jul 26, 2024
@samsrabin samsrabin marked this pull request as ready for review July 26, 2024 15:21
@samsrabin samsrabin requested a review from slevis-lmwg July 26, 2024 15:22
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 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!

@samsrabin
Copy link
Collaborator Author

If I understand correctly, this work sets the stage for bringing in #2593, which we discussed at length a few days ago, right?

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)
@ekluzek ekluzek linked an issue Jul 26, 2024 that may be closed by this pull request
@ekluzek
Copy link
Collaborator

ekluzek commented Jul 26, 2024

Tests on Derecho are still going, but merging this to the branch now. We'll work out the tests for the PR to master.

@ekluzek ekluzek merged commit 2713766 into ESCOMP:scale-maturity-reqs Jul 26, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change out a f19 resolution test on Izumi for f10
3 participants