Skip to content

SIP132 Remove litterWater and clean up - #142

Merged
Alomir merged 5 commits into
masterfrom
SIP132-Remove-litterWater
Aug 22, 2025
Merged

SIP132 Remove litterWater and clean up#142
Alomir merged 5 commits into
masterfrom
SIP132-Remove-litterWater

Conversation

@Alomir

@Alomir Alomir commented Aug 18, 2025

Copy link
Copy Markdown
Collaborator

Fixes #132

This PR:

  • Removes litterWater and associated code
  • Removes fPAR/fAPAR and associated code (general cleanup)
  • Adds a python utility to examine smoke test output and report changes

Note: we expect changes in the smoke tests; however, I did verify that the smoke tests still passed after the initial commit, wherein I collapsed evapSoilFluxes and soilWaterFluxes into one function. That's commit f2f8d3b, which has a green check on it below.

After the remaining code changes, I verified that the only output changes were in litterWater and fPAR; see smoke test results pre-submission:
smoke_res.txt

We WOULD expect more changes when LITTER_POOL is on, except that in that test case (russell_3), we also have WATER_HRESP off, which sidesteps the code that would show such changes. We may want to revisit that config in russell_3. (Note: @infotroph said that the soilWater values might match the now-removed litterWater values, which would also hide behavior changes)

@Alomir Alomir linked an issue Aug 20, 2025 that may be closed by this pull request
5 tasks
@Alomir
Alomir marked this pull request as ready for review August 21, 2025 18:22
@Alomir
Alomir requested review from dlebauer and infotroph August 21, 2025 18:22
@Alomir
Alomir force-pushed the SIP132-Remove-litterWater branch from 6b2cd55 to 69c49fd Compare August 21, 2025 19:27

@dlebauer dlebauer left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This looks great. Only request is that we revisit whether we want to keep these obsolete cols (as discussed in slack). Though, that doesn't have to prevent merging this one.

@Alomir

Alomir commented Aug 22, 2025

Copy link
Copy Markdown
Collaborator Author

#145 for removal of obsolete columns

@Alomir
Alomir merged commit 8b629c9 into master Aug 22, 2025
9 checks passed
@Alomir
Alomir deleted the SIP132-Remove-litterWater branch August 22, 2025 16:21
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.

Remove envi.litterWater and fix soilBreakdown()

2 participants