Skip to content

Conversation

@samsrabin
Copy link
Member

@samsrabin samsrabin commented Jun 26, 2025

Description of changes

Adds SUBSETDATAPOINT and SUBSETDATAREGION tests to aux_clm (and new subset_data suite). These run subset_data for either a point or a six-cell region, then run CTSM with the outputs.

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:

On 0e14784:

  • ❌ Pass aux_clm testing on Derecho; SUBSETDATA tests fail when trying to generate baseline.
  • Pass aux_clm testing on Izumi
  • Pass Python unit testing
  • Pass Python system testing

Final testing:

  • Pass aux_clm testing on Derecho (/glade/derecho/scratch/samrabin/tests_0811-170941de)
  • Pass aux_clm testing on Izumi (/scratch/cluster/samrabin/tests_0811-170954iz/)
  • Pass Python system testing (except for two expected failures that are fixed in Fix py_env_create and tests #3403)
  • Pass Python unit testing (see checks on PR)

@samsrabin samsrabin marked this pull request as draft June 26, 2025 22:03
@samsrabin samsrabin self-assigned this Jun 26, 2025
@samsrabin samsrabin added the testing additions or changes to tests label Jun 26, 2025
@samsrabin samsrabin linked an issue Jun 26, 2025 that may be closed by this pull request
@samsrabin samsrabin changed the base branch from b4b-dev to master June 27, 2025 23:00
@samsrabin samsrabin changed the base branch from master to b4b-dev June 27, 2025 23:00
@samsrabin samsrabin changed the base branch from b4b-dev to master June 30, 2025 16:03
@samsrabin samsrabin changed the base branch from master to b4b-dev June 30, 2025 16:03
samsrabin and others added 4 commits July 2, 2025 08:56
Runs the subset_data point tool, then runs CTSM with the outputs.
Runs subset_data region tool to extract a six-gridcell region, then runs CTSM on the outputs.
@samsrabin samsrabin force-pushed the subsetdata-systemtest branch from b2c3176 to c4604b8 Compare July 2, 2025 14:58
@samsrabin samsrabin changed the title [WIP] Add SystemTests to run subset_data and then CTSM Add SystemTests to run subset_data and then CTSM Jul 2, 2025
@samsrabin samsrabin added PR status: awaiting review Work on this PR is paused while waiting for review. next this should get some attention in the next week or two. Normally each Thursday SE meeting. labels Jul 2, 2025
@samsrabin samsrabin marked this pull request as ready for review July 2, 2025 15:01
@samsrabin samsrabin added the blocked: dependency Wait to work on this until dependency is resolved label Jul 3, 2025
@samsrabin samsrabin requested a review from slevis-lmwg July 3, 2025 16:20
@github-project-automation github-project-automation bot moved this to Ready to start (or start again) in CTSM: Upcoming tags Jul 3, 2025
@samsrabin samsrabin moved this from Ready to start (or start again) to In progress - b4b-dev in CTSM: Upcoming tags Jul 3, 2025
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 and I went over this PR together:

  • @samsrabin posted a few TODOs
  • I posted a question that I missed during the paired review
  • I am approving the PR preemptively

@github-project-automation github-project-automation bot moved this from In progress - b4b-dev to In progress - master in CTSM: Upcoming tags Jul 3, 2025
@samsrabin samsrabin added test: aux_clm Pass aux_clm suite before merging bfb bit-for-bit and removed blocked: dependency Wait to work on this until dependency is resolved PR status: awaiting review Work on this PR is paused while waiting for review. labels Jul 9, 2025
This was causing failure in SETUP phase when generating baselines for the SUBSETDATA SystemTests.
@samsrabin
Copy link
Member Author

samsrabin commented Jul 9, 2025

Turns out that the SUBSETDATA tests don't work when trying to generate baselines. See ESMCI/cime#4819, which fixes the problem, but now serves as a blocker for this PR.

@samsrabin samsrabin added the blocked: dependency Wait to work on this until dependency is resolved label Jul 9, 2025
@samsrabin
Copy link
Member Author

No longer blocked by CIME; bring in tag cime6.1.112.

@samsrabin samsrabin removed the blocked: dependency Wait to work on this until dependency is resolved label Jul 31, 2025
@samsrabin samsrabin changed the base branch from b4b-dev to master August 8, 2025 21:33
@samsrabin
Copy link
Member Author

Merging into master instead of b4b-dev because this depends on CIME updates that happened in ctsm5.3.067, which won't be on b4b-dev for another two weeks.

@samsrabin samsrabin force-pushed the subsetdata-systemtest branch from 095e8df to e16d273 Compare August 8, 2025 21:34
@samsrabin
Copy link
Member Author

samsrabin commented Aug 8, 2025

Initial clm_pymods suite passes: /glade/derecho/scratch/samrabin/tests_0808-154232de/.

@samsrabin samsrabin moved this from In progress - b4b-dev to In progress - master in CTSM: Upcoming tags Aug 8, 2025
Change megan_use_gamma_sm to default false

The soil moisture effect was added in ctsm5.2.020 with MEGAN2.1 and was hardcoded on. As of ctsm5.3.068 megan_use_gamma_sm became default false, which is closer to MEGAN before 2.1. Hence we made megan_use_gamma_sm default off for all CLM physics versions.
@samsrabin samsrabin changed the title Add SystemTests to run subset_data and then CTSM ctsm5.3.069: Add SystemTests to run subset_data and then CTSM Aug 11, 2025
@samsrabin
Copy link
Member Author

samsrabin commented Aug 11, 2025

  • Update ChangeLog/Sum

@samsrabin samsrabin merged commit 37204fb into ESCOMP:master Aug 12, 2025
6 checks passed
@github-project-automation github-project-automation bot moved this from In progress - master to Done (non release/external) in CTSM: Upcoming tags Aug 12, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bfb bit-for-bit PR status: needs testing test: aux_clm Pass aux_clm suite before merging testing additions or changes to tests

Projects

Status: Done (non release/external)

Development

Successfully merging this pull request may close these issues.

Add two new tests that run subset_data and then run a case from it

2 participants