Code

ADM1/ASM2d Translator Update#1435

Code

Merged

adam-a-a merged 87 commits intowatertap-org:mainwatertap-org/watertap:mainfrom MarcusHolly:new_adm1_asm2d_interfaceMarcusHolly/watertap:new_adm1_asm2d_interfaceCopy head branch name to clipboardJul 18, 2024

+1,576-965

Commits

Commits on Jun 13, 2024

• Finish implementation of adm1/asm2d translator

  MarcusHolly

  committed
  af1dc9a

  Copy full SHA for af1dc9a

• Resolve inconsistent unit errors

  MarcusHolly

  committed
  8318db2

  Copy full SHA for 8318db2

• Update test file

  MarcusHolly

  committed
  c0b8329

  Copy full SHA for c0b8329

• Remove completed to-do item

  MarcusHolly

  committed
  b1273c4

  Copy full SHA for b1273c4

Commits on Jun 17, 2024

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  df81af7

  Copy full SHA for df81af7

• Add Soraya's scaling improvements

  MarcusHolly

  committed
  6b6a448

  Copy full SHA for 6b6a448

• Address minor formatting issues

  MarcusHolly

  committed
  66a7c44

  Copy full SHA for 66a7c44

Commits on Jun 18, 2024

• Add BSM2 flowsheet w/new translator

  MarcusHolly

  committed
  07ff096

  Copy full SHA for 07ff096

• New flowsheet solving with Bio_P=True

  MarcusHolly

  committed
  8133b7a

  Copy full SHA for 8133b7a

Commits on Jun 19, 2024

• Minor improvements to BSM2

  MarcusHolly

  committed
  906fb13

  Copy full SHA for 906fb13

• BioP=True solves & BioP=False fails

  MarcusHolly

  committed
  4953299

  Copy full SHA for 4953299

• Update translator documentation

  MarcusHolly

  committed
  f5ee78f

  Copy full SHA for f5ee78f

• Correct imports in test file

  MarcusHolly

  committed
  49ce16c

  Copy full SHA for 49ce16c

Commits on Jun 20, 2024

• Try automating scaling

  MarcusHolly

  committed
  5731370

  Copy full SHA for 5731370

Commits on Jun 21, 2024

• Test autoscaling function

  MarcusHolly

  committed
  22c3091

  Copy full SHA for 22c3091

Commits on Jun 24, 2024

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  98978a0

  Copy full SHA for 98978a0

• Update AD initialization

  MarcusHolly

  committed
  4159a92

  Copy full SHA for 4159a92

• Delete new files and update old files

  MarcusHolly

  committed
  22fd6a9

  Copy full SHA for 22fd6a9

Commits on Jun 26, 2024

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  321b16e

  Copy full SHA for 321b16e

• Add Chenyu's versions of solved flowsheets

  MarcusHolly

  committed
  a205a7a

  Copy full SHA for a205a7a

• Clean up flowsheets

  MarcusHolly

  committed
  87ccc2f

  Copy full SHA for 87ccc2f

Commits on Jun 27, 2024

• Update test solutions

  MarcusHolly

  committed
  7150b66

  Copy full SHA for 7150b66

• Minor cleanup

  MarcusHolly

  committed
  b7b2c17

  Copy full SHA for b7b2c17

• Add scaling factor that was accidentally deleted

  MarcusHolly

  committed
  d637ff4

  Copy full SHA for d637ff4

• Add bac 2nd conservation test

  MarcusHolly

  committed
  33b52e3

  Copy full SHA for 33b52e3

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  9125cda

  Copy full SHA for 9125cda

• Address some electroN-P issues

  MarcusHolly

  committed
  4617c92

  Copy full SHA for 4617c92

• Add scaling function to BSM2 ui file

  MarcusHolly

  committed
  c7b9d56

  Copy full SHA for c7b9d56

• Update test files

  MarcusHolly

  committed
  a95b8e8

  Copy full SHA for a95b8e8

• address Pylint issue

  MarcusHolly

  committed
  07ffba0

  Copy full SHA for 07ffba0

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  9901f3d

  Copy full SHA for 9901f3d

• Change from rel to abs

  MarcusHolly

  committed
  0aaac45

  Copy full SHA for 0aaac45

Commits on Jun 28, 2024

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  b42f408

  Copy full SHA for b42f408

• Change rel to abs for zero-values

  MarcusHolly

  committed
  7d31abb

  Copy full SHA for 7d31abb

• Try updating UI file

  MarcusHolly

  committed
  0e93eb2

  Copy full SHA for 0e93eb2

• Remove costing terms from extended BSM2 GUI

  MarcusHolly

  committed
  59dec65

  Copy full SHA for 59dec65

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  047b8c8

  Copy full SHA for 047b8c8

• Remove bio_P config option

  MarcusHolly

  committed
  e80d531

  Copy full SHA for e80d531

• Address merge conflict

  MarcusHolly

  committed
  dfc95ca

  Copy full SHA for dfc95ca

Commits on Jun 29, 2024

• Chane one more rel to abs

  MarcusHolly

  committed
  9c9655e

  Copy full SHA for 9c9655e

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  814c527

  Copy full SHA for 814c527

Commits on Jul 1, 2024

• Comment out bio_P=False testing and use bio_P=True in UI

  MarcusHolly

  committed
  4e3bc98

  Copy full SHA for 4e3bc98

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  7b7aba8

  Copy full SHA for 7b7aba8

• Add costing to ui

  MarcusHolly

  committed
  bf0bd1b

  Copy full SHA for bf0bd1b

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  d240381

  Copy full SHA for d240381

Commits on Jul 2, 2024

• Address merge conflict

  MarcusHolly

  committed
  b64fba3

  Copy full SHA for b64fba3

• Replace bio with X_{bio}

  MarcusHolly

  committed
  65794b6

  Copy full SHA for 65794b6

• Delete unnecessary outputs from electroNP flowsheet

  MarcusHolly

  committed
  0e157dd

  Copy full SHA for 0e157dd

• Correct mistake in ADM1-ASM2d translator

  MarcusHolly

  committed
  5674852

  Copy full SHA for 5674852

Commits on Jul 3, 2024

• Merge branch 'main' into new_adm1_asm2d_interface

  lbianchi-lbl

  authored
  05de86b

  Copy full SHA for 05de86b

• Flowsheet solving for bio_P = False

  MarcusHolly

  committed
  fa128e1

  Copy full SHA for fa128e1

Commits on Jul 5, 2024

• Update both translator files based on Xavi feedback

  MarcusHolly

  committed
  46872d3

  Copy full SHA for 46872d3

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

  MarcusHolly

  committed
  5214c59

  Copy full SHA for 5214c59

• Undo unit changes in ASM2d/ADM1 translator

  MarcusHolly

  committed
  81a0233

  Copy full SHA for 81a0233

• Correct typo

  MarcusHolly

  committed
  f898cb6

  Copy full SHA for f898cb6

• Update adm1_asm2d test

  MarcusHolly

  committed
  f8471ae

  Copy full SHA for f8471ae

• Update documentation

  MarcusHolly

  committed
  c9eb9d2

  Copy full SHA for c9eb9d2

Commits on Jul 11, 2024

• Revised version of BSM2 and electroNP

  luohezhiming

  committed
  1e6e114

  Copy full SHA for 1e6e114

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

  MarcusHolly

  committed
  7ca83c3

  Copy full SHA for 7ca83c3

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  656fb38

  Copy full SHA for 656fb38

• Clean up BSM2_P_extension flowsheet

  MarcusHolly

  committed
  b469c9b

  Copy full SHA for b469c9b

• Update BSM2 w/ P extension tests

  MarcusHolly

  committed
  230a4d3

  Copy full SHA for 230a4d3

• Update electroN-P flowsheet tests

  MarcusHolly

  committed
  ffed59c

  Copy full SHA for ffed59c

• Update BSM2-P GUI

  MarcusHolly

  committed
  3a1be89

  Copy full SHA for 3a1be89

• Address pylint issue

  MarcusHolly

  committed
  3ea1f3c

  Copy full SHA for 3ea1f3c

• Delete tests for bio_P=True

  MarcusHolly

  committed
  c719fbe

  Copy full SHA for c719fbe

• Have GUI use bio_P=False instead of bio_P=True

  MarcusHolly

  committed
  46071a5

  Copy full SHA for 46071a5

Commits on Jul 12, 2024

• Put common translator parameters inside of ADM1 reaction package

  MarcusHolly

  committed
  c6700b5

  Copy full SHA for c6700b5

Commits on Jul 16, 2024

• Use watertap solver instead of IDAES

  MarcusHolly

  committed
  9bc5840

  Copy full SHA for 9bc5840

• Update tests for bio_P=True and bio_P=False

  MarcusHolly

  committed
  b3cd2bf

  Copy full SHA for b3cd2bf

• Add config option for bio_P into GUI

  MarcusHolly

  committed
  95a6f9b

  Copy full SHA for 95a6f9b

• Address pylint issues

  MarcusHolly

  committed
  f8476c2

  Copy full SHA for f8476c2

• Try to resolve remaining test failures

  MarcusHolly

  committed
  cbbfe6f

  Copy full SHA for cbbfe6f

• Add watertap get_solver to test file

  MarcusHolly

  committed
  bb95f8d

  Copy full SHA for bb95f8d

• Get rid of config option in BSM2-P GUI

  MarcusHolly

  committed
  cc3f243

  Copy full SHA for cc3f243

• Try to resolve GUI issue

  MarcusHolly

  committed
  b63ce95

  Copy full SHA for b63ce95

Commits on Jul 17, 2024

• Minor change to flowsheet scaling

  MarcusHolly

  committed
  4dc04b3

  Copy full SHA for 4dc04b3

• Add require_idaes_solver to BSM2-P GUI

  MarcusHolly

  committed
  4e8d9ed

  Copy full SHA for 4e8d9ed

• Resolve solving issue

  luohezhiming

  committed
  0729d39

  Copy full SHA for 0729d39

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

  luohezhiming

  committed
  cc61553

  Copy full SHA for cc61553

• Comment out everything related to costing

  MarcusHolly

  committed
  a7bdd21

  Copy full SHA for a7bdd21

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

  MarcusHolly

  committed
  77bd768

  Copy full SHA for 77bd768

• Address Pylint issues

  MarcusHolly

  committed
  c06fe0f

  Copy full SHA for c06fe0f

• Address Pylint issues

  MarcusHolly

  committed
  3313322

  Copy full SHA for 3313322

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  committed
  b18c7f2

  Copy full SHA for b18c7f2

Commits on Jul 18, 2024

• Delete BSM2_electroNP flowsheet

  MarcusHolly

  committed
  53baefd

  Copy full SHA for 53baefd

• Merge branch 'main' into new_adm1_asm2d_interface

  MarcusHolly

  authored
  88955db

  Copy full SHA for 88955db