-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BSM2-P Effluent Metrics w/o Flowsheet Constraints (#1492)
* Add effluent metrics to prop pack * Add preliminary effluent violations to the BSM2-P flowsheet * Revert TSS change * Make BOD5_factor a parameter * Update BSM2 GUI images * Define effluent metrics as expressions (as done in ASM1) rather than constraints * Initial attempt at adding optimization to BSM2-P * Disable phosphorus effluent violation * Solves to Acceptable Level * Update unit model tests * Touch effluent metrics before scaling * minor updates * Modify tear guess * Remove optimization functions * Revert changes to BSM2 * Clean up files * Add scaling for metrics * Add scaling factors for effluent metrics * Touch SNOX property * Add SNOX to custom properties * Try reverting some changes * Re-add scaling * Re-add SNOX * Effluent properties don't need to be touched anymore * Add effluent metrics to BSM2-P documentation * Tune effluent metric scaling factors for the bio_P=True case * Try removing all scaling factors for effluent concentrations * Minor adjustments to AD scaling factors * Try more AD scaling changes * Revert AD scaling changes * Another attempt at modifying AD scaling * Resolve remaining test failures * Clean up modified asm2d thermo test * Address pylint issue * Temporarily remove constraints from documentation
- Loading branch information
1 parent
7f85fc0
commit b27f929
Showing
14 changed files
with
363 additions
and
98 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
Binary file modified
BIN
-11.6 KB
(79%)
watertap/flowsheets/full_water_resource_recovery_facility/BSM2_P_extension_ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-12.9 KB
(77%)
watertap/flowsheets/full_water_resource_recovery_facility/BSM2_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.