Code

ASM1 Property Package Re-Scaling#1519

Code

Merged

ksbeattie merged 43 commits intowatertap-org:mainwatertap-org/watertap:mainfrom MarcusHolly:bsm2_prop_scalingMarcusHolly/watertap:bsm2_prop_scalingCopy head branch name to clipboardDec 12, 2024

+1,522-129

Commits

Commits on Nov 6, 2024

• Update property packages

  MarcusHolly

  committed
  836702a

  Copy full SHA for 836702a

• Add scaler testing to asm1_thermo

  MarcusHolly

  committed
  e62dcc3

  Copy full SHA for e62dcc3

Commits on Nov 19, 2024

• Address merge conflicts

  MarcusHolly

  committed
  f80e3a3

  Copy full SHA for f80e3a3

• Undo changes to adm1 properties

  MarcusHolly

  committed
  70d22e5

  Copy full SHA for 70d22e5

• Merge branch 'main' into bsm2_prop_scaling

  lbianchi-lbl

  authored
  4522fb2

  Copy full SHA for 4522fb2

Commits on Nov 20, 2024

• Add iscale functionality back to ASM1 props

  MarcusHolly

  committed
  e20365b

  Copy full SHA for e20365b

• Merge branch 'bsm2_prop_scaling' of https://github.com/MarcusHolly/watertap into bsm2_prop_scaling

  MarcusHolly

  committed
  c99d395

  Copy full SHA for c99d395

• Add scalers for asm1 properties and reactions

  MarcusHolly

  committed
  a8b2439

  Copy full SHA for a8b2439

Commits on Nov 21, 2024

• Minor updates to BSM2 flowsheet

  MarcusHolly

  committed
  8aba2ae

  Copy full SHA for 8aba2ae

• Update testing for BSM2 flowsheet

  MarcusHolly

  committed
  a5b8d49

  Copy full SHA for a5b8d49

• Address pylint issue

  MarcusHolly

  committed
  216cc36

  Copy full SHA for 216cc36

• Update BSM2 Jupyter Notebook

  MarcusHolly

  committed
  c9e5d0d

  Copy full SHA for c9e5d0d

• Update test file

  MarcusHolly

  committed
  744b71c

  Copy full SHA for 744b71c

• Minor updates to BSM2 Jupyter Notebook

  MarcusHolly

  committed
  1208ba7

  Copy full SHA for 1208ba7

Commits on Nov 22, 2024

• Revert small change in asm1_properties

  MarcusHolly

  committed
  ab80927

  Copy full SHA for ab80927

• Merge branch 'main' into bsm2_prop_scaling

  MarcusHolly

  committed
  d553b10

  Copy full SHA for d553b10

• Update asm1_thermo test

  MarcusHolly

  committed
  a91537f

  Copy full SHA for a91537f

• Correct typo

  MarcusHolly

  committed
  7f2134d

  Copy full SHA for 7f2134d

• Have new scaling factors match old scaling factors

  MarcusHolly

  committed
  248b82d

  Copy full SHA for 248b82d

Commits on Nov 29, 2024

• Merge branch 'main' into bsm2_prop_scaling

  MarcusHolly

  committed
  2da3490

  Copy full SHA for 2da3490

• Isolate iscale functionality to calculate_scaling_factors

  MarcusHolly

  committed
  e1f8aa7

  Copy full SHA for e1f8aa7

• Update iscale in unit model testing

  MarcusHolly

  committed
  5a9a73b

  Copy full SHA for 5a9a73b

• Try resolving BSM2 issue

  MarcusHolly

  committed
  3c546a8

  Copy full SHA for 3c546a8

• BSM2 fix attempt watertap-org#2

  MarcusHolly

  committed
  0a97c18

  Copy full SHA for 0a97c18

Commits on Dec 2, 2024

• Update constraint scaling in BSM2

  MarcusHolly

  committed
  e92b7fa

  Copy full SHA for e92b7fa

• UI check passing locally - trying to unfix scaling factors

  MarcusHolly

  committed
  65c52f4

  Copy full SHA for 65c52f4

Commits on Dec 3, 2024

• Call calculate scaling factors in BSM2 costing as well

  MarcusHolly

  committed
  64ed304

  Copy full SHA for 64ed304

• Clean up flowsheet

  MarcusHolly

  committed
  d495c4c

  Copy full SHA for d495c4c

• Try reverting some BSM2 changes

  MarcusHolly

  committed
  e29f85a

  Copy full SHA for e29f85a

Commits on Dec 5, 2024

• Add manual scaling to BSM2 flowsheet

  MarcusHolly

  committed
  146d596

  Copy full SHA for 146d596

• Minor cleanup

  MarcusHolly

  committed
  48b5c0e

  Copy full SHA for 48b5c0e

• Clean up property packages

  MarcusHolly

  committed
  b59b336

  Copy full SHA for b59b336

• Update scaling in unit model tests

  MarcusHolly

  committed
  813c83f

  Copy full SHA for 813c83f

• Update scaling in tests

  MarcusHolly

  committed
  a1773d5

  Copy full SHA for a1773d5

• Revert changes to BSM2 tutorial

  MarcusHolly

  committed
  d575095

  Copy full SHA for d575095

• Add more costing scaling to BSM2

  MarcusHolly

  committed
  58640dc

  Copy full SHA for 58640dc

• Update BSM2 tutorial

  MarcusHolly

  committed
  b8b62b2

  Copy full SHA for b8b62b2

• Address pylint

  MarcusHolly

  committed
  dbf6262

  Copy full SHA for dbf6262

• Update costing scaling factors again

  MarcusHolly

  committed
  d214576

  Copy full SHA for d214576

Commits on Dec 6, 2024

• Update costing scaling factors

  MarcusHolly

  committed
  db6d85d

  Copy full SHA for db6d85d

• Try to resolve MAC failure

  MarcusHolly

  committed
  f5136a9

  Copy full SHA for f5136a9

• Merge branch 'main' into bsm2_prop_scaling

  MarcusHolly

  committed
  13a8b93

  Copy full SHA for 13a8b93

Commits on Dec 12, 2024

• Merge branch 'main' into bsm2_prop_scaling

  ksbeattie

  authored
  937dba5

  Copy full SHA for 937dba5