hydro: reservoir, reach lakes, style guide cleanup #2146
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add (integer) to &hydro_nlist: 0 [lakes off], 1 [level pool], or 2 [passthrough], or 3 [reservoir DA]
- turning lakes off (lake_option=0) will disable lakes even if
route_lake_f is supplied, or outlake is turned on.
- Reservoir DA will not be used unless lake_option=3, even if all
other required namelist options are present
- Reset lake_opt from 3 to 1 after setting DA flag
* Reservoir options have been moved from &hydro_nlist to
&reservoir_nlist
- This will make it easier to isolate / compose namelist files
- If lake_option is not equal to 3, &reservoir_nlist won't be read,
meaning it can be completely removed for applications that don't
need it
- Use reasonable lake_option default when not specified
- Update testing namelists
* Forcing variables names that have been added to namelist.hrldas
* Style guide cleanup
- Indentation and MPI capitalization
- Remove unneeded return statements
- Remove file header
- Tabs to spaces
* Reach Lakes Update
* NetCDF Update: move to modules and nf90 subroutines
|
The regression test results: |
|
Moving from draft to read-for-review. @rcabell I think as the other member of the Tested with coupled WRF|WRF-Hydro Front Range testcase
Attempted to build with |
rcabell
previously approved these changes
Jan 7, 2025
|
Added the single commit from WRF-Hydro PR#803 since it was a bugfix to the gridded lake option. Reran and compared output from a testrun of this PR and the develop branch and the results were the same. |
rcabell
approved these changes
Jan 9, 2025
|
Jenkins regression test results: |
dudhia
approved these changes
Jan 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
TYPE: new feature, enhancement
KEYWORDS: hydro, reservoir, reach lakes, namelist style guide
SOURCE: Soren Rasmussen and Ryan Cabell, NSF NCAR, internal
DESCRIPTION OF CHANGES:
Add lake_opt to namelist, reservoirs to own nlist
Add (integer) to &hydro_nlist: 0 [lakes off], 1 [level pool], or 2 [passthrough], or 3 [reservoir DA]
turning lakes off (lake_option=0) will disable lakes even if
route_lake_f is supplied, or outlake is turned on.
Reservoir DA will not be used unless lake_option=3, even if all
other required namelist options are present
Reset lake_opt from 3 to 1 after setting DA flag
Reservoir options have been moved from &hydro_nlist to
&reservoir_nlist
This will make it easier to isolate / compose namelist files
If lake_option is not equal to 3, &reservoir_nlist won't be read,
meaning it can be completely removed for applications that don't
need it
Use reasonable lake_option default when not specified
Update testing namelists
Forcing variables names that have been added to namelist.hrldas
Reach Lakes: support for lakes (reservoirs) in non-UDMP reach-based routing, restoring functionality that was in WRF-Hydro version 5.1.1
Style guide cleanup
Problem: WRF-Hydro developments need to be ported over for future release
LIST OF MODIFIED FILES:
TESTS CONDUCTED:
RELEASE NOTE:
hydro updates: In
hydro.namelistadding lake_opt to namelist, reservoirs to own namelist. Support for lakes (reservoirs) in non-UDMP reach-based routing added and some style guide cleanup completed.