Add lake_option to hydro_namelist, reservoirs to their own new namelist #725
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 `lake_option` (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
* 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
|
CI Tests failing due to namelist changes. Will update... |
|
I performed the following tests with channel only runs for one to two months.
|
rcabell
force-pushed
the
lakeopt-nml
branch
2 times, most recently
from
0896510
to
b56ef84
Compare
scrasmussen
previously approved these changes
Nov 14, 2023
|
I added a small fix to config.f90 to reset This fix corrects the regression seen on Derecho when using Reservoir DA [not tested on GitHub CI]. |
scrasmussen
approved these changes
Dec 7, 2023
rcabell
commented
Aug 14, 2024
| call hydro_stop("Compound channel option not available for diffusive wave routing. ") | ||
| end if | ||
|
|
||
| if(self%reservoir_type_specified) then | ||
| if(len(trim(self%reservoir_parameter_file)) .eq. 0) then | ||
| if ((self%lake_option .lt. 0) .and. (self%lake_option .gt. 3)) then |
There was a problem hiding this comment.
This should be .or. not .and.
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: enhancement
KEYWORDS: lakes, reservoirs
SOURCE: NCAR
DESCRIPTION OF CHANGES:
Add
lake_option(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
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
TESTS CONDUCTED: In-progress, will convert from Draft and update here when complete.