-
Notifications
You must be signed in to change notification settings - Fork 136
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
Add lake_option to hydro_namelist, reservoirs to their own new namelist #725
base: main
Are you sure you want to change the base?
Conversation
* 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.
|
0896510
to
b56ef84
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Read through everything and it LGTM!
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]. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Those fixes and changes look good!
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be .or. not .and.
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.