-
Notifications
You must be signed in to change notification settings - Fork 11
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
Updates and Improvements to REFLO System Costing #136
Merged
kurbansitterley
merged 72 commits into
watertap-org:main
from
MuktaHardikar:reflo-costing-updates
Nov 15, 2024
Merged
Changes from all commits
Commits
Show all changes
72 commits
Select commit
Hold shift + click to select a range
fd0d4f1
updates to reflo costing
MuktaHardikar a969c21
black
kurbansitterley 2753c75
add frac_elec_from_grid
MuktaHardikar cddf797
add ability to load custom case study definition via yaml
kurbansitterley c43a825
Merge branch 'reflo-costing-updates' of https://github.com/muktahardi…
kurbansitterley 9dd2542
replace _cs_def
kurbansitterley 7f2aa6f
black
kurbansitterley fafb2a7
fix lt-med costing
kurbansitterley 82474b9
fix MED VAGMD semibatch class costing test
kurbansitterley c96b0b7
fix VAGMD batch flowsheet multiperiod test
kurbansitterley 604bf6b
fix trough surrogate test costing
kurbansitterley 00e1856
fix flat plate physical test
kurbansitterley 952c772
fix ltmed surrogate costing test
kurbansitterley 5e87303
fix med-tvc costing test
kurbansitterley bcbd72e
fix VAGMD surrogate test
kurbansitterley cdd94eb
fix air stripping test
kurbansitterley 768e928
fix chem softening costing test
kurbansitterley 48feb7c
fix cryst eff test costing
kurbansitterley 1bfd943
fix DWI costing test
kurbansitterley c15762e
fix mec costing tests
kurbansitterley 7e1bdcd
black
kurbansitterley 975a26b
updating grid_frac equation for more stability. updated expressions t…
MuktaHardikar b43a357
updating electricity grid fraction
MuktaHardikar 68ff1d1
updated grid_frac_elec equation to check for PV
MuktaHardikar 51b8d2d
run black and updated __init__
MuktaHardikar 5f9ef79
trigger tests
kurbansitterley 0adc7db
black trigger tests
kurbansitterley f5e2b05
move electricity/heat balances to build_integrated_costs
kurbansitterley 34f7e21
add check for electricity and heat in used_flows to system costing; h…
kurbansitterley b9188ac
checkpoint
kurbansitterley 840bed2
includes costs when only treatment unit has heat
MuktaHardikar 0a491c3
remove duplicate constraint; correct frac_heat_from_grid constr
kurbansitterley 1cecd0d
system costing has _registered_unit_costing for aggregation of costin…
kurbansitterley 32a5477
remove buy/sell vars from defined_flows
kurbansitterley 94a4a89
revert frac_heat_from_grid constr
kurbansitterley b1606f6
add dummy testing units
kurbansitterley 3c58b48
add dummy flowsheet
kurbansitterley 8b73515
aggregate_flow_heat at system is aggregate_flow_heat for treatment if…
kurbansitterley b261065
scale dummy units
kurbansitterley 9e946c1
raise error or Treatment/EnergyCosting blocks aren't found
kurbansitterley aecb937
implement new approach to handle frac_elec_from_grid
kurbansitterley 6066d93
check param equivalence for all costing blocks
kurbansitterley 20161a3
update to always calc aggregate_flow_heat
MuktaHardikar ec4209d
add elec gen flag to costing
kurbansitterley 7c80926
remove __main__ func
kurbansitterley dc4ecdf
initial update to costing test
kurbansitterley 2c6706f
update initial values; add initialize_build routine
kurbansitterley 76ff804
add no heat dummy treatment unit; black
kurbansitterley 646414d
add scaling factors
kurbansitterley b007a7d
wrong costing method for no heat
kurbansitterley a6c9eca
capex only positive
kurbansitterley b790a12
electricity gen tests complete
kurbansitterley ac5f92a
heat gen only test
kurbansitterley d24c645
add elec and heat generation tests
kurbansitterley 63d097f
add LCOE
kurbansitterley 0d31f82
add_object_reference to LCOE on REFLOSystemCosting
kurbansitterley 67636bf
add SEEC, STEC, LCOH; scaling
kurbansitterley 1f18dcd
add LCOT, LCOW to REFLOSystemCosting; can't add LCOW to EnergyCosting
kurbansitterley b400a40
add metric tests
kurbansitterley b042c6a
use TreatmentCosting so can add LCOW for test
kurbansitterley 5e72b25
Merge branch 'main' into reflo-costing-updates
kurbansitterley f203134
corrected currency year
zacharybinger e1d46a2
fix unit inconsistency issue
kurbansitterley 698af60
fix unit inconsistency issue
kurbansitterley f4ff080
add initialize for LCOT, LCOH, LCOE
kurbansitterley e4023bb
add assert_units_consistent test; heat/energy metric testing; aggrega…
kurbansitterley 8bcd94c
fix currency unit conversions
kurbansitterley 855ab5e
fix failing tests
kurbansitterley 92812df
fix unit
kurbansitterley b0d59ba
remove return from test
kurbansitterley 15724cd
fix test
kurbansitterley d989a0d
fix test
kurbansitterley File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
1 change: 0 additions & 1 deletion
1
src/watertap_contrib/reflo/analysis/case_studies/KBHDP/__init__.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1 @@ | ||
from .components import * | ||
from .KBHDP_SOA import * |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just a comment on PV costs: it would be totally fair to cost PV out on a $/kW_dc basis. I remember using numbers on the order of $1000 - $2000/kWdc
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is how we do it already?