Electricity annual revenue profile fix #49
Merged
Conversation
This file contains hidden or 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
…eously replaced with total revenue
Comment on lines
+2807
to
+2819
| self.TotalRevenue.value = self.ElecRevenue.value.copy() | ||
| #self.TotalCummRevenue.value = self.ElecCummRevenue.value | ||
| elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value not in [PlantType.ABSORPTION_CHILLER]: | ||
| self.HeatRevenue.value, self.HeatCummRevenue.value = CalculateRevenue( | ||
| model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, | ||
| model.surfaceplant.HeatkWhProduced.value, self.HeatPrice.value) | ||
| self.TotalRevenue.value = self.HeatRevenue.value | ||
| self.TotalRevenue.value = self.HeatRevenue.value.copy() | ||
| #self.TotalCummRevenue.value = self.HeatCummRevenue.value | ||
| elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value in [PlantType.ABSORPTION_CHILLER]: | ||
| self.CoolingRevenue.value, self.CoolingCummRevenue.value = CalculateRevenue( | ||
| model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value, | ||
| model.surfaceplant.cooling_kWh_Produced.value, self.CoolingPrice.value) | ||
| self.TotalRevenue.value = self.CoolingRevenue.value | ||
| self.TotalRevenue.value = self.CoolingRevenue.value.copy() |
There was a problem hiding this comment.
Adding .copy() here prevents subsequent changes to self.TotalRevenue from affecting self.{Elec|Heat|Cooling}Revenue because self.TotalRevenue is now a copy of the values instead of a reference to the same object.
Comment on lines
+177
to
+178
| 1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -28.12 -28.12 | ||
| 2 15.00 2.70 2.70 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.94 -26.18 |
There was a problem hiding this comment.
Example file diffs should only change electricity annual revenue column, which I manually verified in full for Fervo Cape Station 3 example and sanity-eyeball-checked for other results.
This was referenced Mar 5, 2025
softwareengineerprogrammer
deleted the
electricity-revenue-profile-revenue-fix
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fix issue with revenue profile electricity annual revenue being erroneously replaced with total revenue (NREL#342)
Demonstration of fix for
Fervo_Project_Cape-3: