forked from watertap-org/watertap
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ADM1/ASM2d Translator Update (watertap-org#1435)
* Finish implementation of adm1/asm2d translator * Resolve inconsistent unit errors * Update test file * Remove completed to-do item * Add Soraya's scaling improvements * Address minor formatting issues * Add BSM2 flowsheet w/new translator * New flowsheet solving with Bio_P=True * Minor improvements to BSM2 * BioP=True solves & BioP=False fails * Update translator documentation * Correct imports in test file * Try automating scaling * Test autoscaling function * Update AD initialization * Delete new files and update old files * Add Chenyu's versions of solved flowsheets * Clean up flowsheets * Update test solutions * Minor cleanup * Add scaling factor that was accidentally deleted * Add bac 2nd conservation test * Address some electroN-P issues * Add scaling function to BSM2 ui file * Update test files * address Pylint issue * Change from rel to abs * Change rel to abs for zero-values * Try updating UI file * Remove costing terms from extended BSM2 GUI * Remove bio_P config option * Chane one more rel to abs * Comment out bio_P=False testing and use bio_P=True in UI * Add costing to ui * Replace bio with X_{bio} * Delete unnecessary outputs from electroNP flowsheet * Correct mistake in ADM1-ASM2d translator * Flowsheet solving for bio_P = False * Update both translator files based on Xavi feedback * Undo unit changes in ASM2d/ADM1 translator * Correct typo * Update adm1_asm2d test * Update documentation * Revised version of BSM2 and electroNP * Clean up BSM2_P_extension flowsheet * Update BSM2 w/ P extension tests * Update electroN-P flowsheet tests * Update BSM2-P GUI * Address pylint issue * Delete tests for bio_P=True * Have GUI use bio_P=False instead of bio_P=True * Put common translator parameters inside of ADM1 reaction package * Use watertap solver instead of IDAES * Update tests for bio_P=True and bio_P=False * Add config option for bio_P into GUI * Address pylint issues * Try to resolve remaining test failures * Add watertap get_solver to test file * Get rid of config option in BSM2-P GUI * Try to resolve GUI issue * Minor change to flowsheet scaling * Add require_idaes_solver to BSM2-P GUI * Resolve solving issue * Comment out everything related to costing * Address Pylint issues * Address Pylint issues * Delete BSM2_electroNP flowsheet --------- Co-authored-by: Ludovico Bianchi <[email protected]> Co-authored-by: luohezhiming <[email protected]>
- Loading branch information
1 parent
080c644
commit f94f21d
Showing
14 changed files
with
1,576 additions
and
965 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
Oops, something went wrong.