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.
The current NWM 2.1 Lake Out files have additional fields for "reservoir_type" and "reservoir_assimilated_value". These values are also needed for NWM 3.0. These values do not affect anything in the model and are only for output purposes to assist the user in evaluating Hybrid and RFC type reservoirs. These values are dynamic and output from Hybrid and RFC type reservoirs at every timestep.
These values are assembled into dataframes indexed by lake/reservoir id at these locations:
https://github.com/jdmattern-noaa/t-route/blob/additional-reservoir-outputs/src/nwm_routing/src/nwm_routing/__main__.py#L705
https://github.com/jdmattern-noaa/t-route/blob/additional-reservoir-outputs/src/nwm_routing/src/nwm_routing/output.py#L102
These additions were tested with the three different types of reservoirs in the Croton NY domain and with the CustomInput.yaml file. All cases pass fine on the Cheyenne system. On apd-dev, all of the Croton cases pass fine, but the CustomInput.yaml case interestingly does not terminate and does not pass this existing function:
https://github.com/jdmattern-noaa/t-route/blob/additional-reservoir-outputs/src/python_framework_v02/troute/nhd_io.py#L352
The CustomInput.yaml case will successfully complete though if the creation of either one of the dataframes is commented out and not created at the above link in main.py. This leads me to believe that it could be a memory issue though the domain is very small with relatively few timesteps. I recommend merging this branch and potentially investigating further. I can open an issue for this if recommended.
This PR closes #466.
@mehdire61
Checklist
Testing checklist
Target Environment support
Accessibility
Other