-
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.
ASM1 Property Package Re-Scaling (#1519)
* Update property packages * Add scaler testing to asm1_thermo * Undo changes to adm1 properties * Add iscale functionality back to ASM1 props * Add scalers for asm1 properties and reactions * Minor updates to BSM2 flowsheet * Update testing for BSM2 flowsheet * Address pylint issue * Update BSM2 Jupyter Notebook * Update test file * Minor updates to BSM2 Jupyter Notebook * Revert small change in asm1_properties * Update asm1_thermo test * Correct typo * Have new scaling factors match old scaling factors * Isolate iscale functionality to calculate_scaling_factors * Update iscale in unit model testing * Try resolving BSM2 issue * BSM2 fix attempt #2 * Update constraint scaling in BSM2 * UI check passing locally - trying to unfix scaling factors * Call calculate scaling factors in BSM2 costing as well * Clean up flowsheet * Try reverting some BSM2 changes * Add manual scaling to BSM2 flowsheet * Minor cleanup * Clean up property packages * Update scaling in unit model tests * Update scaling in tests * Revert changes to BSM2 tutorial * Add more costing scaling to BSM2 * Update BSM2 tutorial * Address pylint * Update costing scaling factors again * Update costing scaling factors * Try to resolve MAC failure --------- Co-authored-by: Ludovico Bianchi <[email protected]> Co-authored-by: Keith Beattie <[email protected]>
- Loading branch information
1 parent
28c6b81
commit fd83d37
Showing
15 changed files
with
1,522 additions
and
129 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
Oops, something went wrong.