Skip to content

Conversation

@samsrabin
Copy link
Member

@samsrabin samsrabin commented Jun 18, 2025

Description of changes

  • Include --lon-type 180 in subset_data command to avoid ambiguity.
  • If PLUMBER2 sites CSV file has -999 for a pft number, do not set that to zero—instead, just don't include a second PFT.
  • Respect whether user requested a 16- or 78-PFT file.
  • Add --overwrite option.
  • Add --plumber2-sites-csv option to specify CSV file path.
  • Add argument parser unit testing.
  • Add system testing.
  • Error on subset_data failure.

Specific notes

Contributors other than yourself, if any: None

CTSM Issues Fixed: Resolves #3262

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: As of c325805:

  • Manual testing with commands given in plumber2_surf_wrapper: Some files not produced #3262
  • The 62 files originally being produced (at 761bb47) aren't affected.
  • Python unit tests
  • Python system tests
  • clm_pymods suite: /glade/derecho/scratch/samrabin/tests_0620-185305de/

@samsrabin samsrabin self-assigned this Jun 18, 2025
@samsrabin samsrabin added bug something is working incorrectly bfb bit-for-bit test: python Pass clm_pymods test suite plus Python sys/unit tests before merging labels Jun 18, 2025
@samsrabin samsrabin changed the base branch from master to b4b-dev June 18, 2025 22:44
@samsrabin samsrabin added the blocked: dependency Wait to work on this until dependency is resolved label Jun 18, 2025
@github-project-automation github-project-automation bot moved this to Ready to start (or start again) in CTSM: Upcoming tags Jun 20, 2025
@samsrabin samsrabin moved this from Ready to start (or start again) to In progress - b4b-dev in CTSM: Upcoming tags Jun 20, 2025
@ekluzek ekluzek self-requested a review June 20, 2025 21:17
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.

@samsrabin and I went over this. And this is great work and I'm glad to see it come in. It fixes problems, but also makes the code more robust, with better error handling, AND it adds good testing for all this. So this will save the project time downstream.

I added a few comments/questions here that @samsrabin will decide on. I'm happy to approve it and have it come in shortly.

@github-project-automation github-project-automation bot moved this from In progress - b4b-dev to In progress - master in CTSM: Upcoming tags Jun 20, 2025
@samsrabin samsrabin force-pushed the plumber2_surf_wrapper-fixes branch from 722504e to 63d61f4 Compare June 20, 2025 22:08
@samsrabin samsrabin changed the base branch from b4b-dev to master June 20, 2025 22:38
@samsrabin samsrabin changed the base branch from master to b4b-dev June 20, 2025 22:39
@samsrabin samsrabin merged commit 4e753aa into ESCOMP:b4b-dev Jun 21, 2025
5 checks passed
@github-project-automation github-project-automation bot moved this from In progress - master to Done (non release/external) in CTSM: Upcoming tags Jun 21, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bfb bit-for-bit blocked: dependency Wait to work on this until dependency is resolved bug something is working incorrectly test: python Pass clm_pymods test suite plus Python sys/unit tests before merging

Projects

Status: Done (non release/external)

Development

Successfully merging this pull request may close these issues.

plumber2_surf_wrapper: Some files not produced

2 participants