Code

Enable RO0D to be dynamic#1471

Code

Merged

adam-a-a merged 126 commits intowatertap-org:mainwatertap-org/watertap:mainfrom fahim831:dynamic-exploratory2fahim831/watertap:dynamic-exploratory2Copy head branch name to clipboardOct 30, 2024

+160-20

Commits

Commits on Jul 24, 2024

• revised dyanmic and has holdup for membrane channel base/RO 0D, but prop pack needs get_material_density_terms

  adam-a-a

  committed
  0992ca4

• Changed dynamic and has_holdup to not be hardcoded to False

  fahim831

  committed
  07ee8d2

Commits on Jul 25, 2024

• Merge branch 'ro0d_hasholdup' into dynamic-exploratory2

  adam-a-a

  committed
  ddc50db

• run black

  adam-a-a

  committed
  fa7dc7f

• cleanup test

  adam-a-a

  committed
  90707f2

• Fixed NaCl property package as per TIm's instructions to allow dynamics

  fahim831

  committed
  3554e8c

• add material_density by component

  adam-a-a

  committed
  511db4a

• Merge branch 'mat_dens_terms' into dynamic-exploratory2

  adam-a-a

  committed
  7951363

• blk

  adam-a-a

  committed
  6fcd8a6

• put mat dens expr in right place

  adam-a-a

  committed
  3d0b908

• fix mat dens epr brackets

  adam-a-a

  committed
  d8f9287

• fix ro test

  adam-a-a

  committed
  8b9e407

• blk

  adam-a-a

  committed
  6d34229

• fix unintentional addition of conc_mass_phase_comp to state vars

  adam-a-a

  committed
  cd04d24

• remove commented out code

  adam-a-a

  committed
  2685ebd

• Merge branch 'watertap-org:main' into dynamic-exploratory2

  fahim831

  authored
  e3dab5e

• add new instance with simple configs

  adam-a-a

  committed
  42ffd7a

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  adam-a-a

  committed
  e9bd78a

• black

  adam-a-a

  committed
  d88c80e

• Added numbers to initialize RO0D unit_models

  fahim831

  committed
  e111ec8

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  fahim831

  committed
  b4af3b4

• raise config error for simple RO

  adam-a-a

  committed
  f59b598

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  adam-a-a

  committed
  1c19e60

• Added pressure change back in to be identical to Adam's specs

  fahim831

  committed
  90dfda7

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  fahim831

  committed
  78eaa5d

Commits on Jul 30, 2024

• setup.py point to dynamic_cv0d

  kurbansitterley

  committed
  6c0d5af

• add back pyomo

  kurbansitterley

  committed
  6e6a3a8

• black

  kurbansitterley

  committed
  49c8ac8

• revert debug changes after idaes PR fix; add check to tests to check units on material_accumulation

  adam-a-a

  committed
  c94d453

• cleanup and check material_holdup

  adam-a-a

  committed
  a143bc3

• adjust test

  adam-a-a

  committed
  b6ad14a

• blk

  adam-a-a

  committed
  939a8ee

• initialize without the assert_units_consistent check in place

  adam-a-a

  committed
  f875b52

• mixed_permeate as CV0D

  kurbansitterley

  committed
  0f418f5

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  kurbansitterley

  committed
  30ca95c

• black RO-base

  kurbansitterley

  committed
  3f30fbd

• add permeate port to mixed_permeate

  kurbansitterley

  committed
  4c304fb

• revert debug changes after idaes PR fix; add check to tests to check units on material_accumulation

  

  adam-a-a

  authored and

  kurbansitterley

  committed
  ad43f37

• cleanup and check material_holdup

  

  adam-a-a

  authored and

  kurbansitterley

  committed
  b14f6c0

• adjust test

  

  adam-a-a

  authored and

  kurbansitterley

  committed
  8f5bb1d

• blk

  

  adam-a-a

  authored and

  kurbansitterley

  committed
  d219511

• initialize without the assert_units_consistent check in place

  

  adam-a-a

  authored and

  kurbansitterley

  committed
  88062be

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  kurbansitterley

  committed
  7c77610

• undo RO0D and RObase changes

  kurbansitterley

  committed
  ed81950

• revert setup.py

  kurbansitterley

  committed
  a9c8758

• black again

  kurbansitterley

  committed
  79cfc27

Commits on Jul 31, 2024

• add idaes temporary dependency

  adam-a-a

  committed
  e816dc5

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  adam-a-a

  committed
  4e8b0fa

• black

  adam-a-a

  committed
  f1f5a77

• add idaes dependency with CV0D fix

  adam-a-a

  committed
  8678ffe

• blk

  adam-a-a

  committed
  48a42d2

• move assertion

  adam-a-a

  committed
  607821a

• Currently DOF=2

  fahim831

  committed
  0feba1a

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  fahim831

  committed
  2db6427

Commits on Aug 1, 2024

• petsc succeeds with DOF=0

  adam-a-a

  committed
  0befd21

• cleanup

  adam-a-a

  committed
  34c7370

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  adam-a-a

  committed
  69396f3

• bring my changes back in after merging with fahim's last commits

  adam-a-a

  committed
  5a9e47f

• remove unused imports

  adam-a-a

  committed
  ab88730

• one more import to delete

  adam-a-a

  committed
  8fdfc1d

• add petsc to github actions

  adam-a-a

  committed
  1e13c0a

• skip test for workflows that don't have petsc available; note, tests work and pass for windows/linux checks

  adam-a-a

  committed
  2845d43

Commits on Aug 2, 2024

• Nonzero accumulation. Can get dynamic change now.

  fahim831

  committed
  6ffa537

Commits on Aug 3, 2024

• Getting a plot for RO0D now.

  fahim831

  committed
  38695bb

• Plotting permeate NaCl conc.

  fahim831

  committed
  2347c54

Commits on Aug 5, 2024

• Plotting feed outlet C_NaCl

  fahim831

  committed
  f215368

• Blacked RO0D test

  fahim831

  committed
  c4fd016

• Plots 5 things.

  fahim831

  committed
  0247f90

Commits on Aug 9, 2024

• Preliminary results obtained.

  fahim831

  committed
  cabfad7

Commits on Aug 12, 2024

• try to fix failed mac test and run black

  adam-a-a

  committed
  546d4d7

Commits on Aug 15, 2024

• revised dyanmic and has holdup for membrane channel base/RO 0D, but prop pack needs get_material_density_terms

  

  adam-a-a

  authored and

  fahim831

  committed
  d52cc8b

• add material_density by component

  

  adam-a-a

  authored and

  fahim831

  committed
  18db269

• fix mat dens epr brackets

  

  adam-a-a

  authored and

  fahim831

  committed
  8590640

• add new instance with simple configs

  

  adam-a-a

  authored and

  fahim831

  committed
  8e6f7a1

• raise config error for simple RO

  

  adam-a-a

  authored and

  fahim831

  committed
  e22a7d6

• black

  

  kurbansitterley

  authored and

  fahim831

  committed
  8bc6f6c

• revert debug changes after idaes PR fix; add check to tests to check units on material_accumulation

  

  adam-a-a

  authored and

  fahim831

  committed
  2356a5f

• revert debug changes after idaes PR fix; add check to tests to check units on material_accumulation

  

  adam-a-a

  authored and

  fahim831

  committed
  91e696b

• petsc succeeds with DOF=0

  

  adam-a-a

  authored and

  fahim831

  committed
  a8c2ead

• Currently DOF=2

  fahim831

  committed
  b54a7ba

• bring my changes back in after merging with fahim's last commits

  

  adam-a-a

  authored and

  fahim831

  committed
  5f16747

• remove unused imports

  

  adam-a-a

  authored and

  fahim831

  committed
  d54b982

• Validate dynamic results.

  fahim831

  committed
  b20bc96

• Validate dynamic model.

  fahim831

  committed
  8b29ade

• Validate dynamic model.

  fahim831

  committed
  89806cf

• Merge branch 'watertap-org:main' into dynamic-exploratory2

  fahim831

  authored
  8eb9dd2

• black

  adam-a-a

  committed
  d8f0054

• try to fix test_cstr

  adam-a-a

  committed
  1e714fa

• bk

  adam-a-a

  committed
  861e6bd

• test commit

  kurbansitterley

  committed
  7bd476f

• black again

  adam-a-a

  committed
  409e693

• remove unused import

  adam-a-a

  committed
  9e32a65

Commits on Aug 20, 2024

• Revert "try to fix failed mac test and run black"

  Show description for 7feaca4
  adam-a-a

  committed
  7feaca4

• test ro back up and running

  adam-a-a

  committed
  8ed69f7

• run black and remove extra import

  adam-a-a

  committed
  b020636

• cleanup RO base

  adam-a-a

  committed
  5014771

• Apply suggestions from code review

  Show description for 05c0b71
  

  adam-a-a

  and

  lbianchi-lbl

  authored
  05c0b71

• Update setup.py

  Show description for 867071b
  

  adam-a-a

  and

  lbianchi-lbl

  authored
  867071b

Commits on Aug 22, 2024

• Merge branch 'main' into dynamic-exploratory2

  adam-a-a

  authored
  a282f18

Commits on Sep 11, 2024

• Merge branch 'main' into dynamic-exploratory2

  adam-a-a

  authored
  1cdd1a2

• fix checks

  adam-a-a

  committed
  fb0ed2d

• probe failure

  adam-a-a

  committed
  cbabaca

• bring back reverted commit

  adam-a-a

  committed
  0e2bfe0

• Revert "Merge branch 'main' into dynamic-exploratory2"

  Show description for 32f6ab6
  adam-a-a

  committed
  32f6ab6

• remove file that surprisingly made its way into a commit

  adam-a-a

  committed
  c3edf5f

• point to 2.6rc

  adam-a-a

  committed
  ac7ec77

Commits on Sep 12, 2024

• Merge branch 'main' into dynamic-exploratory2

  adam-a-a

  authored
  ca1b1ac

• adjust HRT constraint on cstr and check failing macos test

  adam-a-a

  committed
  fccd484

• remove unused import

  adam-a-a

  committed
  998259a

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  adam-a-a

  committed
  88a78c8

• black

  adam-a-a

  committed
  8ef8e4b

• reset membrance_channel0d to match main

  adam-a-a

  committed
  efa5423

Commits on Sep 13, 2024

• merge main flowsheets

  adam-a-a

  committed
  5aff8c4

• bring back other changes that are in main already

  adam-a-a

  committed
  f3e52a8

• Merge branch 'main' into dynamic-exploratory2

  adam-a-a

  authored
  096dbcd

Commits on Oct 3, 2024

• revert hydraulic retention time constraint

  adam-a-a

  committed
  0f3a41d

• Merge branch 'dynamic-exploratory2' of https://github.com/fahim831/watertap into dynamic-exploratory2

  adam-a-a

  committed
  99b1e8c

Commits on Oct 7, 2024

• checkpoint: add scaling to cstr but didn't note any affect on BSM2-P solver iterations; also replacing aeration tank on bsm2-p instead of cstr_injection with flowsheet level vars and constraints

  adam-a-a

  committed
  bd2caa8

Commits on Oct 18, 2024

• Merge branch 'main' of https://github.com/watertap-org/watertap

  adam-a-a

  committed
  05b717a

Commits on Oct 23, 2024

• add requires idaes solver mark for dynamic ro test

  adam-a-a

  committed
  ce1232c

• Merge branch 'main' into dynamic-exploratory2

  adam-a-a

  committed
  62e9fa9

Commits on Oct 24, 2024

• cleanup

  adam-a-a

  committed
  5752735

• Revert "checkpoint: add scaling to cstr but didn't note any affect on BSM2-P solver iterations; also replacing aeration tank on bsm2-p instead of cstr_injection with flowsheet level vars and constr…

  Show description for f755bf8
  adam-a-a

  committed
  f755bf8

• black

  adam-a-a

  committed
  10ae589

• address pylint

  adam-a-a

  committed
  07b53b7

• Merge branch 'main' into dynamic-exploratory2

  adam-a-a

  authored
  8e6f462