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

updating LASAM to take field capacity as a parameter in the config file #22

Merged
merged 15 commits into from
Apr 16, 2024

Conversation

peterlafollette
Copy link
Contributor

@peterlafollette peterlafollette commented Apr 5, 2024

[Short description explaining the high-level reason for the pull request]

Additions

In this PR, LASAM has been mildly refactored in order to have the field capacity be a user-specified parameter in the config file, in the same style as wilting point. I also updated the calibratable params list in bmi_lgar.hxx to include field capacity, as well as max ponded head. I also edited that list to not include vg_m and instead use vg_n, because the parameters file provides n rather than m.

Removals

Changes

Testing

Screenshots

Notes

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Visually tested in supported browsers and devices (see checklist below 👇)
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool ➡️

Testing checklist

Target Environment support

  • Windows
  • Linux
  • Browser

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

…le, in the same style as wilting point. I also updated the calibratable params list in bmi_lgar.hxx to include field capacaity, as well as max ponded head. I also edited that list to not include vg_m and instead use vg_n, because the parameters file provides n rather than m.
Copy link
Collaborator

@ajkhattak ajkhattak left a comment

Choose a reason for hiding this comment

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

@peterlafollette have you tested if the newly added calibratable parameters are working properly? It looks to me that they are not, they are also not included in the calibratable params struct (here)

@peterlafollette
Copy link
Contributor Author

Updated so that unit tests pass with n rather than m, will add max ponded depth and field capacity to unit test for calibration today / tomorrow

Peter La Follette added 3 commits April 11, 2024 18:33
…ta issues in the unit test. Unit test values should now be correct. Added precision to unit test benchmark values. Also fixed a bug where GetValuePtr should now work for field capacity and max ponded head.
@peterlafollette
Copy link
Contributor Author

Updated so that unit test checks calibration for all calibratable variables, including n, max ponded depth, and field capacity.

Peter La Follette added 7 commits April 12, 2024 09:01
…mi_params for max ponded depth and field capacity. Apparently it gives the same results, but this update makes all calibratable parameters get pointers from GetValuePtr.
… apply to the whole model domain, and some parameters apply to individual soil layers. In the last commit, all calibratable parameters were updated correctly, but all parameters were printed for each soil layer, implying that some of the parameters that applied to the whole model domain actually only applied to individual layers. Now, printing updated calibrated parameters has two sections, one for layer dependent parameters, and one for layer independent.
…everting these, and keeping calibratable parameters in realization files
Copy link
Collaborator

@ajkhattak ajkhattak left a comment

Choose a reason for hiding this comment

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

It looks good to me. Thanks @peterlafollette

@ajkhattak ajkhattak merged commit d4f32cc into master Apr 16, 2024
4 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.

2 participants