Code

Applying Scalers to BSM2 Flowsheets#1550

Code

Draft

MarcusHolly wants to merge 52 commits intowatertap-org:mainwatertap-org/watertap:mainfrom MarcusHolly:bsm2_scaler_scalingMarcusHolly/watertap:bsm2_scaler_scalingCopy head branch name to clipboard

+2,592-135

Commits

Commits on Nov 22, 2024

• Create initial files for ADM1 scalers

  MarcusHolly

  committed
  7531440

  Copy full SHA for 7531440

• Add new scaler objects

  MarcusHolly

  committed
  059803e

  Copy full SHA for 059803e

• Update tests

  MarcusHolly

  committed
  a0921cd

  Copy full SHA for a0921cd

• Carry over ASM1 scaler updates

  MarcusHolly

  committed
  367f18c

  Copy full SHA for 367f18c

Commits on Nov 25, 2024

• Create first draft of AD Scaler object

  MarcusHolly

  committed
  40ab286

  Copy full SHA for 40ab286

Commits on Nov 27, 2024

• Move iscale scaling to calculate_scaling_factors

  MarcusHolly

  committed
  03e970a

  Copy full SHA for 03e970a

• Move more iscale scaling to calculate_scaling_factors

  MarcusHolly

  committed
  863e6b3

  Copy full SHA for 863e6b3

Commits on Nov 29, 2024

• Move iscale functionality in AD to calculate_scaling_factors

  MarcusHolly

  committed
  01427e9

  Copy full SHA for 01427e9

• Merge branch 'main' into AD_unit_scaling

  MarcusHolly

  committed
  2bcc1b6

  Copy full SHA for 2bcc1b6

• Address pylint issue

  MarcusHolly

  committed
  9b624d9

  Copy full SHA for 9b624d9

• Undo changes to adm1 vapor property package

  MarcusHolly

  committed
  07aabdd

  Copy full SHA for 07aabdd

Commits on Dec 2, 2024

• Update tests

  MarcusHolly

  committed
  7b73282

  Copy full SHA for 7b73282

• Trying to resolve BSM2P issues

  MarcusHolly

  committed
  ff3a127

  Copy full SHA for ff3a127

Commits on Dec 6, 2024

• Merge branch 'main' into AD_unit_scaling

  MarcusHolly

  committed
  7a6867b

  Copy full SHA for 7a6867b

• Carry over latest changes from other scaler PRs

  MarcusHolly

  committed
  f6203ea

  Copy full SHA for f6203ea

Commits on Dec 10, 2024

• Update Jupyter notebook

  MarcusHolly

  committed
  de4ca55

  Copy full SHA for de4ca55

• Cut back on scaling and update tests

  MarcusHolly

  committed
  2e9aaaf

  Copy full SHA for 2e9aaaf

Commits on Dec 11, 2024

• Merge branch 'main' into AD_unit_scaling

  MarcusHolly

  committed
  8943b4e

  Copy full SHA for 8943b4e

• Improve scaling for bio_P=False configuration

  MarcusHolly

  committed
  9797a52

  Copy full SHA for 9797a52

Commits on Dec 12, 2024

• Test changes to boi_P=False scaling

  MarcusHolly

  committed
  c7f05a6

  Copy full SHA for c7f05a6

• Try adjusting scaling again

  MarcusHolly

  committed
  3313ef2

  Copy full SHA for 3313ef2

• Add additional scaling for heat and enthalpy

  MarcusHolly

  committed
  9eb6984

  Copy full SHA for 9eb6984

• Use InverseMaximum scaling scheme

  MarcusHolly

  committed
  1e57393

  Copy full SHA for 1e57393

• Additional scaling improvement

  MarcusHolly

  committed
  f75f4b0

  Copy full SHA for f75f4b0

• Add rate expression constraint scaling

  MarcusHolly

  committed
  0dc4b4f

  Copy full SHA for 0dc4b4f

Commits on Dec 13, 2024

• Use inverseMinimum and update test

  MarcusHolly

  committed
  5dda788

  Copy full SHA for 5dda788

• Address merge conflicts

  MarcusHolly

  committed
  07688ab

  Copy full SHA for 07688ab

• Address additional merge conflicts

  MarcusHolly

  committed
  0fa813e

  Copy full SHA for 0fa813e

Commits on Dec 14, 2024

• Clean up flowsheet

  MarcusHolly

  committed
  01ffa20

  Copy full SHA for 01ffa20

Commits on Dec 16, 2024

• Update BSM2-P test

  MarcusHolly

  committed
  1086276

  Copy full SHA for 1086276

• Update BSM2-P test

  MarcusHolly

  committed
  93862e7

  Copy full SHA for 93862e7

• Use inverseRSS scaling scheme

  MarcusHolly

  committed
  5f467b5

  Copy full SHA for 5f467b5

• Add scaling for hydraulic retention time

  MarcusHolly

  committed
  ac27d2b

  Copy full SHA for ac27d2b

• Change scaling factor for conc_mass_comp

  MarcusHolly

  committed
  b83aded

  Copy full SHA for b83aded

• Clean up flowsheet

  MarcusHolly

  committed
  e7758fc

  Copy full SHA for e7758fc

Commits on Dec 17, 2024

• Merge branch 'main' into AD_unit_scaling

  MarcusHolly

  committed
  a05549a

  Copy full SHA for a05549a

• Update AD testing

  MarcusHolly

  committed
  3a54930

  Copy full SHA for 3a54930

Commits on Dec 23, 2024

• Merge branch 'main' into AD_unit_scaling

  MarcusHolly

  committed
  448b18a

  Copy full SHA for 448b18a

• Undo changes to modified ADM1 rxn test

  MarcusHolly

  committed
  aa789c0

  Copy full SHA for aa789c0

• Add check for condition number in BSM2-P test

  MarcusHolly

  committed
  10c9583

  Copy full SHA for 10c9583

• Update condition number test

  MarcusHolly

  committed
  7c8becb

  Copy full SHA for 7c8becb

• Address pylint issue

  MarcusHolly

  committed
  7681d4b

  Copy full SHA for 7681d4b

Commits on Jan 2, 2025

• Add CSTR scalers

  MarcusHolly

  committed
  9f11bfc

  Copy full SHA for 9f11bfc

• Add clarifier scaling

  MarcusHolly

  committed
  534ccdd

  Copy full SHA for 534ccdd

• Add dewaterer/thickener scalers

  MarcusHolly

  committed
  beb4d7d

  Copy full SHA for beb4d7d

• Add translator scalers

  MarcusHolly

  committed
  f791e58

  Copy full SHA for f791e58

• Add config option for scaling routine to BSM2

  MarcusHolly

  committed
  e98c7bb

  Copy full SHA for e98c7bb

• Add aeration tank scaler

  MarcusHolly

  committed
  6b0957e

  Copy full SHA for 6b0957e

Commits on Jan 6, 2025

• Preliminary version of BSM2 with scalers

  MarcusHolly

  committed
  93c5410

  Copy full SHA for 93c5410

Commits on Jan 8, 2025

• BSM2-P solving to acceptable level

  MarcusHolly

  committed
  0f25608

  Copy full SHA for 0f25608

Commits on Jan 10, 2025

• Add To-Do note on TransformationFactory scaling

  MarcusHolly

  committed
  0c4493a

  Copy full SHA for 0c4493a

Commits on Jan 14, 2025

• Try refining scaling more

  MarcusHolly

  committed
  fde1c01

  Copy full SHA for fde1c01