Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
7729396
initial commit moving existing efficiency calc into own function
Jan 16, 2026
d89c1c7
Pump takes speed as an input and finds efficiency
Jan 16, 2026
062f754
Added test day for lower speed operation
Jan 16, 2026
1ca834c
Head and flow are inputs to find speed and efficiency. Doesn't work atm.
Jan 20, 2026
fcb1cb1
Merge branch 'main' of https://github.com/watertap-org/flex_desal int…
Jan 20, 2026
1f34195
Able to calculate speed and efficiency for IS pump on 8_19
Jan 21, 2026
9e50fce
Adding first stage and uf pump head fits
Jan 21, 2026
615ee45
Conversions and testing file
Jan 24, 2026
7902696
Creating dataset to build a surrogate on for Ro feed pump
Jan 28, 2026
234d4fe
Creating surrogate with higher minimum head bounds
Jan 28, 2026
cae3b44
Adding more points for better sampling for RO feed pump
Jan 28, 2026
1c61f3f
Copied over surrogate modeling folder from other PR
Jan 28, 2026
caaa6e5
Created IS pump surrogate
Jan 28, 2026
be6ac4a
UF pump surrogate created
Jan 29, 2026
23da216
black
Jan 29, 2026
a83f501
Changing initialized values for better stability and removing solve e…
Jan 29, 2026
7a10d3b
Adding tests for pump to ensure it initializes and solves for differe…
Jan 30, 2026
e04f69f
Remaking the surrogate data for pumps for Josh to use (uploaded to Box)
Jan 31, 2026
c2681ec
black
Feb 2, 2026
8439c27
Clean-up and reorganization of files
Feb 3, 2026
3c8a6bc
black
Feb 3, 2026
850bf2e
Pump able to take speed and head or flow and head and find efficiency.
Feb 4, 2026
706e71d
Adding test to check speed can be an input
Feb 4, 2026
bd65cc1
Removed uneeded helper fx and added error handing when passing too fe…
Feb 4, 2026
4e325c3
Updates so all three input options run when calling main in the pump …
Feb 4, 2026
62a484b
uf_train can be run in way compatable with the pump model
Feb 4, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added solution.pickle
Binary file not shown.
6 changes: 3 additions & 3 deletions src/wrd/components/UF_train.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ def set_inlet_conditions(m, Qin=2637, Cin=0.5, Tin=298, Pin=101325):


def set_uf_train_op_conditions(blk, split_fractions=None):
set_pump_op_conditions(blk.pump, uf=True)
set_pump_op_conditions(blk.pump)
if split_fractions is None:
split_fractions = {
"product": {"H2O": 0.99, "NaCl": 0.99},
Expand Down Expand Up @@ -237,7 +237,7 @@ def main(
calculate_scaling_factors(m)
set_inlet_conditions(m, Qin=Qin, Cin=Cin, Tin=Tin, Pin=Pin)
set_uf_train_op_conditions(m.fs.uf_train)
assert degrees_of_freedom(m) == 0
# assert degrees_of_freedom(m) == 0 # Now a degree of freedom is applying during the intialization of the pump
initialize_system(m)
results = solver.solve(m, tee=True)
assert_optimal_termination(results)
Expand All @@ -261,4 +261,4 @@ def main(


if __name__ == "__main__":
m = main()
m = main(add_costing=True)
Loading
Loading