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.

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 Costing in Dye Desal Flowsheet #1485

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2aa08a0
Correct costing in dye desalination flowsheet
MarcusHolly Sep 3, 2024
b110d0d
Remove negative signs from costs in the results display
MarcusHolly Sep 3, 2024
041ec42
Address Adam's comment and a few minor issues
MarcusHolly Sep 4, 2024
36bb363
Address failure
MarcusHolly Sep 4, 2024
3a2b106
Merge branch 'main' into dye_desal_update
MarcusHolly Sep 4, 2024
ce179cb
Correct typo in nanofiltration ZO costing
MarcusHolly Sep 10, 2024
f7b0105
Minor changes to parameter values
MarcusHolly Sep 10, 2024
e3c19b1
Merge branch 'main' into dye_desal_update
MarcusHolly Sep 10, 2024
4b3ed9e
Update dye desal sweep
MarcusHolly Sep 11, 2024
8d236af
Update dye desal tests
MarcusHolly Sep 20, 2024
a1f827a
Merge branch 'main' into dye_desal_update
MarcusHolly Sep 20, 2024
47ce925
Remove visualization from dye sweep
MarcusHolly Sep 20, 2024
f7767fa
Update NF ZO test
MarcusHolly Sep 22, 2024
93977df
Address pylint issue
MarcusHolly Sep 23, 2024
22dfc3d
Have GAC use regular dye disposal cost
MarcusHolly Sep 23, 2024
67dc007
Update test based on last commit
MarcusHolly Sep 23, 2024
bee127e
Add config options for dye revenue and brine revenue
MarcusHolly Sep 24, 2024
80ecc03
Comment out print statements
MarcusHolly Sep 25, 2024
3e56b85
Update dye desal sweep
MarcusHolly Sep 25, 2024
6ee28e4
Update how LCOT_no_revenue is calculated
MarcusHolly Sep 26, 2024
baaa6c3
Clean up flowsheet
MarcusHolly Oct 4, 2024
7077be8
Merge branch 'main' into dye_desal_update
MarcusHolly Oct 4, 2024
ddd603f
Merge branch 'main' into dye_desal_update
MarcusHolly Oct 11, 2024
210e3b9
Merge branch 'main' into dye_desal_update
MarcusHolly Oct 25, 2024
d38900c
Update capital recovery factor for RO_costing
MarcusHolly Oct 25, 2024
0e13d23
Add scaling factors for costing variables
MarcusHolly Oct 25, 2024
6ef0385
Remove badly scaled var list from flowsheet
MarcusHolly Oct 31, 2024
f2868e6
Merge branch 'main' into dye_desal_update
MarcusHolly Oct 31, 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