Skip to content

Commit d3920bc

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
authored
Merge pull request #49 from softwareengineerprogrammer/electricity-revenue-profile-revenue-fix
Electricity annual revenue profile fix NREL#342
2 parents f0cb15e + ff392e7 commit d3920bc

35 files changed

+852
-852
lines changed

‎.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.7.20
2+
current_version = 3.7.21
33
commit = True
44
tag = True
55

‎.cookiecutterrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ default_context:
5454
sphinx_doctest: "no"
5555
sphinx_theme: "sphinx-py3doc-enhanced-theme"
5656
test_matrix_separate_coverage: "no"
57-
version: 3.7.20
57+
version: 3.7.21
5858
version_manager: "bump2version"
5959
website: "https://github.com/NREL"
6060
year_from: "2023"

‎README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ Free software: `MIT license <LICENSE>`__
5656
:alt: Supported implementations
5757
:target: https://pypi.org/project/geophires-x
5858

59-
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.20.svg
59+
.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.21.svg
6060
:alt: Commits since latest release
61-
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.20...main
61+
:target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.21...main
6262

6363
.. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat
6464
:target: https://nrel.github.io/GEOPHIRES-X

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
year = '2025'
1919
author = 'NREL'
2020
copyright = f'{year}, {author}'
21-
version = release = '3.7.20'
21+
version = release = '3.7.21'
2222

2323
pygments_style = 'trac'
2424
templates_path = ['./templates']

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def read(*names, **kwargs):
1313

1414
setup(
1515
name='geophires-x',
16-
version='3.7.20',
16+
version='3.7.21',
1717
license='MIT',
1818
description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.',
1919
long_description='{}\n{}'.format(

‎src/geophires_x/Economics.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2804,19 +2804,19 @@ def Calculate(self, model: Model) -> None:
28042804
self.ElecRevenue.value, self.ElecCummRevenue.value = CalculateRevenue(
28052805
model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value,
28062806
model.surfaceplant.NetkWhProduced.value, self.ElecPrice.value)
2807-
self.TotalRevenue.value = self.ElecRevenue.value
2807+
self.TotalRevenue.value = self.ElecRevenue.value.copy()
28082808
#self.TotalCummRevenue.value = self.ElecCummRevenue.value
28092809
elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value not in [PlantType.ABSORPTION_CHILLER]:
28102810
self.HeatRevenue.value, self.HeatCummRevenue.value = CalculateRevenue(
28112811
model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value,
28122812
model.surfaceplant.HeatkWhProduced.value, self.HeatPrice.value)
2813-
self.TotalRevenue.value = self.HeatRevenue.value
2813+
self.TotalRevenue.value = self.HeatRevenue.value.copy()
28142814
#self.TotalCummRevenue.value = self.HeatCummRevenue.value
28152815
elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value in [PlantType.ABSORPTION_CHILLER]:
28162816
self.CoolingRevenue.value, self.CoolingCummRevenue.value = CalculateRevenue(
28172817
model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value,
28182818
model.surfaceplant.cooling_kWh_Produced.value, self.CoolingPrice.value)
2819-
self.TotalRevenue.value = self.CoolingRevenue.value
2819+
self.TotalRevenue.value = self.CoolingRevenue.value.copy()
28202820
#self.TotalCummRevenue.value = self.CoolingCummRevenue.value
28212821
elif model.surfaceplant.enduse_option.value in [EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT,
28222822
EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY,

‎src/geophires_x/SBTEconomics.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -755,19 +755,19 @@ def Calculate(self, model: Model) -> None:
755755
self.ElecRevenue.value, self.ElecCummRevenue.value = CalculateRevenue(
756756
model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value,
757757
model.surfaceplant.NetkWhProduced.value, self.ElecPrice.value)
758-
self.TotalRevenue.value = self.ElecRevenue.value
758+
self.TotalRevenue.value = self.ElecRevenue.value.copy()
759759
#self.TotalCummRevenue.value = self.ElecCummRevenue.value
760760
elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value not in [PlantType.ABSORPTION_CHILLER]:
761761
self.HeatRevenue.value, self.HeatCummRevenue.value = CalculateRevenue(
762762
model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value,
763763
model.surfaceplant.HeatkWhProduced.value, self.HeatPrice.value)
764-
self.TotalRevenue.value = self.HeatRevenue.value
764+
self.TotalRevenue.value = self.HeatRevenue.value.copy()
765765
#self.TotalCummRevenue.value = self.HeatCummRevenue.value
766766
elif model.surfaceplant.enduse_option.value == EndUseOptions.HEAT and model.surfaceplant.plant_type.value in [PlantType.ABSORPTION_CHILLER]:
767767
self.CoolingRevenue.value, self.CoolingCummRevenue.value = CalculateRevenue(
768768
model.surfaceplant.plant_lifetime.value, model.surfaceplant.construction_years.value,
769769
model.surfaceplant.cooling_kWh_Produced.value, self.CoolingPrice.value)
770-
self.TotalRevenue.value = self.CoolingRevenue.value
770+
self.TotalRevenue.value = self.CoolingRevenue.value.copy()
771771
#self.TotalCummRevenue.value = self.CoolingCummRevenue.value
772772
elif model.surfaceplant.enduse_option.value in [EndUseOptions.COGENERATION_TOPPING_EXTRA_HEAT,
773773
EndUseOptions.COGENERATION_TOPPING_EXTRA_ELECTRICITY,

‎src/geophires_x/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '3.7.20'
1+
__version__ = '3.7.21'

‎tests/example1_addons.csv

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
100100
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
101101
SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,%
102-
Simulation Metadata,GEOPHIRES Version,,3.7.19,
102+
Simulation Metadata,GEOPHIRES Version,,3.7.20,
103103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
104104
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
105105
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,
@@ -670,36 +670,36 @@ REVENUE & CASHFLOW PROFILE,Electricity Price,27,15.0,cents/kWh
670670
REVENUE & CASHFLOW PROFILE,Electricity Price,28,15.0,cents/kWh
671671
REVENUE & CASHFLOW PROFILE,Electricity Price,29,15.0,cents/kWh
672672
REVENUE & CASHFLOW PROFILE,Electricity Price,30,15.0,cents/kWh
673-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,1,-31.07,MUSD/yr
674-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,5.07,MUSD/yr
675-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,5.12,MUSD/yr
676-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,5.13,MUSD/yr
677-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,5.14,MUSD/yr
678-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,5.15,MUSD/yr
679-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,5.15,MUSD/yr
680-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,6.02,MUSD/yr
681-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,6.88,MUSD/yr
682-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,7.74,MUSD/yr
683-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,8.6,MUSD/yr
684-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,12,9.47,MUSD/yr
685-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,13,9.82,MUSD/yr
686-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,14,10.17,MUSD/yr
687-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,15,10.52,MUSD/yr
688-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,16,10.7,MUSD/yr
689-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,17,10.71,MUSD/yr
690-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,18,10.71,MUSD/yr
691-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,19,10.71,MUSD/yr
692-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,20,10.71,MUSD/yr
693-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,21,10.72,MUSD/yr
694-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,22,10.72,MUSD/yr
695-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,23,10.72,MUSD/yr
696-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,24,10.72,MUSD/yr
697-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,25,10.72,MUSD/yr
698-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,26,10.73,MUSD/yr
699-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,10.73,MUSD/yr
700-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,10.73,MUSD/yr
701-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,10.73,MUSD/yr
702-
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,10.73,MUSD/yr
673+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,1,0.0,MUSD/yr
674+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,2,3.74,MUSD/yr
675+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,3,3.78,MUSD/yr
676+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,4,3.8,MUSD/yr
677+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,5,3.81,MUSD/yr
678+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,6,3.81,MUSD/yr
679+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,7,3.82,MUSD/yr
680+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,8,4.33,MUSD/yr
681+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,9,4.84,MUSD/yr
682+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,10,5.36,MUSD/yr
683+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,11,5.87,MUSD/yr
684+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,12,6.38,MUSD/yr
685+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,13,6.39,MUSD/yr
686+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,14,6.39,MUSD/yr
687+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,15,6.39,MUSD/yr
688+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,16,6.39,MUSD/yr
689+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,17,6.39,MUSD/yr
690+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,18,6.4,MUSD/yr
691+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,19,6.4,MUSD/yr
692+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,20,6.4,MUSD/yr
693+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,21,6.4,MUSD/yr
694+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,22,6.4,MUSD/yr
695+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,23,6.4,MUSD/yr
696+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,24,6.4,MUSD/yr
697+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,25,6.41,MUSD/yr
698+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,26,6.41,MUSD/yr
699+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,27,6.41,MUSD/yr
700+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,28,6.41,MUSD/yr
701+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,29,6.41,MUSD/yr
702+
REVENUE & CASHFLOW PROFILE,Electricity Ann. Rev.,30,6.41,MUSD/yr
703703
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,1,0.0,MUSD
704704
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,2,3.74,MUSD
705705
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,3,7.53,MUSD

‎tests/examples/Fervo_Norbeck_Latimer_2023.out

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.19
8-
Simulation Date: 2025-02-28
9-
Simulation Time: 11:34
10-
Calculation Time: 0.459 sec
7+
GEOPHIRES Version: 3.7.20
8+
Simulation Date: 2025-03-04
9+
Simulation Time: 08:31
10+
Calculation Time: 0.447 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -174,13 +174,13 @@ Year Electricity | Heat |
174174
Since Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | OPEX Net Rev. Net Cashflow
175175
Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/lb) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD)
176176
________________________________________________________________________________________________________________________________________________________________________________________
177-
1 0.00 -28.12 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
178-
2 15.00 1.94 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
179-
3 15.00 1.97 5.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.97 -24.21
180-
4 15.41 2.06 8.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.06 -22.15
181-
5 15.81 2.14 11.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.14 -20.00
182-
6 16.22 2.22 14.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.22 -17.78
183-
7 16.62 2.30 17.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.30 -15.48
184-
8 17.03 2.37 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.37 -13.12
185-
9 17.43 2.39 23.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.39 -10.73
186-
10 17.84 2.29 26.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.29 -8.44
177+
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
178+
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
179+
3 15.00 2.74 5.44 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 1.97 -24.21
180+
4 15.41 2.83 8.26 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.06 -22.15
181+
5 15.81 2.91 11.17 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.14 -20.00
182+
6 16.22 2.99 14.16 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.22 -17.78
183+
7 16.62 3.06 17.22 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.30 -15.48
184+
8 17.03 3.13 20.35 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.37 -13.12
185+
9 17.43 3.15 23.51 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.39 -10.73
186+
10 17.84 3.05 26.56 | 2.50 0.00 0.00 | 2.50 0.00 0.00 | 0.00 0.00 0.00 | 0.76 2.29 -8.44

0 commit comments

Comments
 (0)