-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Dye Desalination Parameter Update (#1126)
* Add option to add/remove pretreatment in dye desal with RO * Adjust default parameters based on project team's suggestions * Update test files * Add more scaling to dye desal with RO * Address test failures associated with the GUI & nanofiltration * Update dye desal sweep analysis * Resolve test_dye_sweep failure * Address pylint errors * Readthedocs fix * Expand code coverage * Update dye desal GUI * Minor clean-up * Fix GUI test failure * Add config option for dye revenue/disposal cost * Update sweep analyses * Fix test_dye_sweep * Print additional cost metrics * Change dye_revenue from a mass basis to a volumetric basis * Change dye_sweep plots from LCOW to LCOT * Update sweep analyses * Address some of Adam's suggestions * Replace include_pretreatment boolean with hasattr * Refine pretreatment initialization * Make salt rejection = 0.05 and dye rejection = 0.99 * Update dye disposal cost and water revenue values * Replace brine disposal cost (/m3) with brine revenue (/m3) in NF flowsheet * Update tests * Update sweep analyses * Update sweep analysis * Change dye & salt disposal costs from a vol basis to a mass basis * Update sweep analysis * Revert back to volumetric basis * Update sweep analysis * Delete visualization tools * Address pylint issues * Update GUI * Add hasattr's into GUI for pretreatment * Update GUI image * Remove has_dye_revenue config option and clean up files * Move dye disposal cost from revenue section to operating costs section
- Loading branch information
1 parent
3b75723
commit 3744d2c
Showing
11 changed files
with
568 additions
and
245 deletions.
There are no files selected for viewing
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
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
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
Binary file modified
BIN
-197 KB
(21%)
...e_studies/wastewater_resource_recovery/dye_desalination/dye_desalination_ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Oops, something went wrong.