Bug fix in roughness unit conversion when using D-W #450
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
kbonney
approved these changes
Oct 21, 2024
| @@ -571,7 +571,7 @@ def _to_si(self, flow_units, data, darcy_weisbach=False): | |||
|
|
|||
| elif self in [HydParam.RoughnessCoeff] and darcy_weisbach: | |||
| if flow_units.is_traditional: | |||
| data = data * (1000.0 * 0.3048) # 1e-3 ft to m | |||
| data = data * (0.001 * 0.3048) # 1e-3 ft to m | |||
There was a problem hiding this comment.
I worked out the conversion and agree with this change.
| @@ -668,7 +668,7 @@ def _from_si(self, flow_units, data, darcy_weisbach=False): | |||
|
|
|||
| elif self in [HydParam.RoughnessCoeff] and darcy_weisbach: | |||
| if flow_units.is_traditional: | |||
| data = data / (1000.0 * 0.3048) # 1e-3 ft from m | |||
| data = data / (0.001 * 0.3048) # 1e-3 ft from m | |||
There was a problem hiding this comment.
I worked out the conversion and agree with this change.
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.
Summary
The following PR addresses #443 regarding unit conversion of the roughness coefficient when using D-W headloss formula. This update only impacts the EpanetSimulator which requires the unit conversion when reading/writing the INP file. The WNTRSimulator does not support D-W headloss formula.
The original code did not convert roughness in
_read_pipesand_write_pipes. Theto_siandfrom_siconversion functions for roughness were also incorrect and updated.If
wn.options.hydraulic.headlossis changed from ['H-W', 'C-M'] to/from 'D-W', a UserWarning is printed to the screen. The units of headloss cannot be converted from unitless to/from length.Tests and documentation
Tests were added to
test_epanet_io.py. The mean absolute error in pressure values for Net3 is within 0.55 m when using H-W, C-M, and D-W with GPM and LPS.Acknowledgement
By contributing to this software project, I acknowledge that I have reviewed the software quality assurance guidelines and that my contributions are submitted under the Revised BSD License.