Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update BSM2-P Costing #1468

Merged
merged 26 commits into from
Sep 9, 2024
Merged

Update BSM2-P Costing #1468

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
16acde6
Add back costing w/ scaling and initialization adjustments
MarcusHolly Jul 19, 2024
d2a97c1
condense scale factor applied to capital costs; tried scaling agg cap…
adam-a-a Jul 20, 2024
b34e2f4
add interval_initializer to ui code
adam-a-a Jul 20, 2024
e04f02f
run blk
adam-a-a Jul 20, 2024
00f230a
comment out interval_initializer
adam-a-a Jul 22, 2024
5c3cd21
try again
adam-a-a Jul 22, 2024
6039b32
Remove .value from bio config option in UI
MarcusHolly Jul 22, 2024
ff43938
Merge branch 'bsm2_playground' of https://github.com/MarcusHolly/wate…
MarcusHolly Jul 22, 2024
a2758de
Undo repeated code
MarcusHolly Jul 22, 2024
0387012
Adjust conc_mass_comp scaling
MarcusHolly Jul 25, 2024
378aa1c
Update tests
MarcusHolly Jul 26, 2024
3b8dc5c
Test costing w/ only AD
MarcusHolly Aug 13, 2024
ae08b79
Remove costing
MarcusHolly Aug 13, 2024
5b02e8f
Test costing w/AD and clarifiers
MarcusHolly Aug 13, 2024
5c643e8
Test costing w/ AD and clarifiers
MarcusHolly Aug 13, 2024
5768c4f
Test w/ AD & minor changes
MarcusHolly Aug 13, 2024
b22a992
Remove optimal termination checks in main
MarcusHolly Aug 13, 2024
5327ead
Test costing with only one clarifier
MarcusHolly Aug 14, 2024
064ba29
Add diagnostics check
MarcusHolly Aug 14, 2024
946f803
Change instance of rel tolerance to abs
MarcusHolly Aug 15, 2024
eb3a5da
Address merge conflicts
MarcusHolly Sep 6, 2024
5daf327
Update BSM2 flowsheet after Chenyu's PR
MarcusHolly Sep 6, 2024
e85d564
Update tests
MarcusHolly Sep 9, 2024
4474be4
Add costing back to BSM2 GUI
MarcusHolly Sep 9, 2024
8df615e
Clean up flowsheet
MarcusHolly Sep 9, 2024
d79c630
Remove commented code
MarcusHolly Sep 9, 2024
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
Loading
Loading