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 subset_data (cth and cbh not iterable) #2528

Merged
merged 14 commits into from
May 6, 2024

Conversation

samsrabin
Copy link
Collaborator

@samsrabin samsrabin commented May 6, 2024

Description of changes

Ensures that cth and cbh are iterable before passing to zip(). Without this, most calls of subset_data (at least for single-point cases) will fail.

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? Not needed

Testing performed, if any:

  • Python unit tests were corrected to catch this error. They now pass after the fix.
  • New unit tests added for new utility function ensure_iterable().
  • Python system tests pass.

olyson and others added 8 commits May 2, 2024 10:09
FATES default allometry parameter file update

This updates the default FATES parameter file which includes a number
of changes:

   - Default global tree pft allometry update
   - New allometric mode options
   - New scaling coefficients for alternative leaf maintenance respiration
   - New switch to control the use of host land model day length scaling factor

This also incorporates some testing additions and clean up, including:

   - Removes cheyenne expected failure tests that have been converted to derecho
   - Adds a 5x5_amazon test to aux_clm and the expected failures list
   - Temporarilry converts a fates 5x5_amazon test to f10 test
   - Adds namelist check and corresponding unit test to make sure fates hydro
     and fates satellite phenology mode can not be used together

The FATES externals tag is also updated which includes a number of bug fixes
and the addition of new history output.
@samsrabin samsrabin self-assigned this May 6, 2024
@samsrabin samsrabin added the tests additions or changes to tests label May 6, 2024
@samsrabin samsrabin marked this pull request as ready for review May 6, 2024 20:09
@samsrabin samsrabin added the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label May 6, 2024
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 thank you for coming up with this elegant solution and for including unit tests for it. I do not see issues or have concerns if you have confirmed that it works.

@samsrabin samsrabin merged commit 9a28e2a into ESCOMP:master May 6, 2024
2 checks passed
@wwieder
Copy link
Contributor

wwieder commented May 7, 2024

Thanks for getting this in @samsrabin. when I suggested the next b4bdev tag I wasn't meaning this one, but thanks for busting this out!

@samsrabin samsrabin removed the next this should get some attention in the next week or two. Normally each Thursday SE meeting. label Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
tests additions or changes to tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

subset_data is broken
5 participants