MCAS in SWRO Flowsheet - #1849

Open

adam-a-a wants to merge 26 commits into

watertap-org:mainfrom

adam-a-a:swro_mcas

Commits on Jul 6, 2026

consolidate costing packages on swro flowsheet and update base currency to 2023
adam-a-a
committed
0d34e5c
blk
adam-a-a
committed
2e5f423
update ui file
adam-a-a
committed
e59addd
blk
adam-a-a
committed
0cd815e

Commits on Jul 7, 2026

Commits on Jul 9, 2026

assign mw data that will provide same/similar osmotic pressure as before
adam-a-a
committed
76dccb5

Commits on Jul 16, 2026

Merge branch 'main' into swro_mcas
adam-a-a
authored
e82bb70

Commits on Jul 24, 2026

repair initialization and other cleanup; flowsheet can finally initialize and solve with mcas only!
adam-a-a
committed
d247b31

Commits on Jul 28, 2026

make MCAS compatible with the whole SWRO flowsheet; add intake costing and pelton turbine ERD costing; cleanup translator code (remove)
adam-a-a
committed
1c75867
black
adam-a-a
committed
5437c66
remove imports
adam-a-a
committed
a77db08

Commits on Jul 29, 2026

fix some tests and ui code
adam-a-a
committed
ca9a2d6
cleanup commented code
adam-a-a
committed
24089ff
black
adam-a-a
committed
c6efd82
fix function sig
adam-a-a
committed
270027c
update diffusivity and tests
adam-a-a
committed
66cbf54
update spacer porosity to be closer to reality
adam-a-a
committed
8c3794f
blk
adam-a-a
committed
24d08e4

Commits on Jul 30, 2026

Merge branch 'main' into swro_mcas
adam-a-a
authored
970a409
fix initialization for 1d pxr case; change some regression tests
adam-a-a
committed
0bccf1f
blk
adam-a-a
committed
d14dae9

Commits on Jul 31, 2026

Merge branch 'swro_mcas' of https://github.com/adam-a-a/watertap into swro_mcas
adam-a-a
committed
9d6ba37