Skip to content

Commit ff1f5ea

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Fix cooling price param name
1 parent f1ed50a commit ff1f5ea

File tree

4 files changed

+97
-97
lines changed

4 files changed

+97
-97
lines changed

‎src/geophires_x/Economics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1539,7 +1539,7 @@ def __init__(self, model: Model):
15391539
CurrentUnits=EnergyCostUnit.DOLLARSPERKWH,
15401540
)
15411541
self.CoolingPrice = self.OutputParameterDict[self.CoolingPrice.Name] = OutputParameter(
1542-
"Heat Sale Price Model",
1542+
"Cooling Sale Price Model",
15431543
UnitType=Units.ENERGYCOST,
15441544
PreferredUnits=EnergyCostUnit.CENTSSPERKWH,
15451545
CurrentUnits=EnergyCostUnit.DOLLARSPERKWH,

‎tests/example1_addons.csv

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
9696
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
9797
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
9898
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
99-
Simulation Metadata,GEOPHIRES Version,,3.4.29,
99+
Simulation Metadata,GEOPHIRES Version,,3.4.31,
100100
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
101101
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,
102102
POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073,
@@ -728,35 +728,35 @@ REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,28,151.92,MUSD
728728
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,29,158.33,MUSD
729729
REVENUE & CASHFLOW PROFILE,Electricity Cumm. Rev.,30,164.74,MUSD
730730
REVENUE & CASHFLOW PROFILE,Heat Price,1,0.0,cents/kWh
731-
REVENUE & CASHFLOW PROFILE,Heat Price,2,2.5,cents/kWh
732-
REVENUE & CASHFLOW PROFILE,Heat Price,3,2.5,cents/kWh
733-
REVENUE & CASHFLOW PROFILE,Heat Price,4,2.5,cents/kWh
734-
REVENUE & CASHFLOW PROFILE,Heat Price,5,2.5,cents/kWh
735-
REVENUE & CASHFLOW PROFILE,Heat Price,6,2.5,cents/kWh
736-
REVENUE & CASHFLOW PROFILE,Heat Price,7,2.5,cents/kWh
737-
REVENUE & CASHFLOW PROFILE,Heat Price,8,2.5,cents/kWh
738-
REVENUE & CASHFLOW PROFILE,Heat Price,9,2.5,cents/kWh
739-
REVENUE & CASHFLOW PROFILE,Heat Price,10,2.5,cents/kWh
740-
REVENUE & CASHFLOW PROFILE,Heat Price,11,2.5,cents/kWh
741-
REVENUE & CASHFLOW PROFILE,Heat Price,12,2.5,cents/kWh
742-
REVENUE & CASHFLOW PROFILE,Heat Price,13,2.5,cents/kWh
743-
REVENUE & CASHFLOW PROFILE,Heat Price,14,2.5,cents/kWh
744-
REVENUE & CASHFLOW PROFILE,Heat Price,15,2.5,cents/kWh
745-
REVENUE & CASHFLOW PROFILE,Heat Price,16,2.5,cents/kWh
746-
REVENUE & CASHFLOW PROFILE,Heat Price,17,2.5,cents/kWh
747-
REVENUE & CASHFLOW PROFILE,Heat Price,18,2.5,cents/kWh
748-
REVENUE & CASHFLOW PROFILE,Heat Price,19,2.5,cents/kWh
749-
REVENUE & CASHFLOW PROFILE,Heat Price,20,2.5,cents/kWh
750-
REVENUE & CASHFLOW PROFILE,Heat Price,21,2.5,cents/kWh
751-
REVENUE & CASHFLOW PROFILE,Heat Price,22,2.5,cents/kWh
752-
REVENUE & CASHFLOW PROFILE,Heat Price,23,2.5,cents/kWh
753-
REVENUE & CASHFLOW PROFILE,Heat Price,24,2.5,cents/kWh
754-
REVENUE & CASHFLOW PROFILE,Heat Price,25,2.5,cents/kWh
755-
REVENUE & CASHFLOW PROFILE,Heat Price,26,2.5,cents/kWh
756-
REVENUE & CASHFLOW PROFILE,Heat Price,27,2.5,cents/kWh
757-
REVENUE & CASHFLOW PROFILE,Heat Price,28,2.5,cents/kWh
758-
REVENUE & CASHFLOW PROFILE,Heat Price,29,2.5,cents/kWh
759-
REVENUE & CASHFLOW PROFILE,Heat Price,30,2.5,cents/kWh
731+
REVENUE & CASHFLOW PROFILE,Heat Price,2,1.23,cents/kWh
732+
REVENUE & CASHFLOW PROFILE,Heat Price,3,1.23,cents/kWh
733+
REVENUE & CASHFLOW PROFILE,Heat Price,4,1.23,cents/kWh
734+
REVENUE & CASHFLOW PROFILE,Heat Price,5,1.23,cents/kWh
735+
REVENUE & CASHFLOW PROFILE,Heat Price,6,1.23,cents/kWh
736+
REVENUE & CASHFLOW PROFILE,Heat Price,7,1.23,cents/kWh
737+
REVENUE & CASHFLOW PROFILE,Heat Price,8,1.23,cents/kWh
738+
REVENUE & CASHFLOW PROFILE,Heat Price,9,1.23,cents/kWh
739+
REVENUE & CASHFLOW PROFILE,Heat Price,10,2.23,cents/kWh
740+
REVENUE & CASHFLOW PROFILE,Heat Price,11,3.23,cents/kWh
741+
REVENUE & CASHFLOW PROFILE,Heat Price,12,3.59,cents/kWh
742+
REVENUE & CASHFLOW PROFILE,Heat Price,13,3.59,cents/kWh
743+
REVENUE & CASHFLOW PROFILE,Heat Price,14,3.59,cents/kWh
744+
REVENUE & CASHFLOW PROFILE,Heat Price,15,3.59,cents/kWh
745+
REVENUE & CASHFLOW PROFILE,Heat Price,16,3.59,cents/kWh
746+
REVENUE & CASHFLOW PROFILE,Heat Price,17,3.59,cents/kWh
747+
REVENUE & CASHFLOW PROFILE,Heat Price,18,3.59,cents/kWh
748+
REVENUE & CASHFLOW PROFILE,Heat Price,19,3.59,cents/kWh
749+
REVENUE & CASHFLOW PROFILE,Heat Price,20,3.59,cents/kWh
750+
REVENUE & CASHFLOW PROFILE,Heat Price,21,3.59,cents/kWh
751+
REVENUE & CASHFLOW PROFILE,Heat Price,22,3.59,cents/kWh
752+
REVENUE & CASHFLOW PROFILE,Heat Price,23,3.59,cents/kWh
753+
REVENUE & CASHFLOW PROFILE,Heat Price,24,3.59,cents/kWh
754+
REVENUE & CASHFLOW PROFILE,Heat Price,25,3.59,cents/kWh
755+
REVENUE & CASHFLOW PROFILE,Heat Price,26,3.59,cents/kWh
756+
REVENUE & CASHFLOW PROFILE,Heat Price,27,3.59,cents/kWh
757+
REVENUE & CASHFLOW PROFILE,Heat Price,28,3.59,cents/kWh
758+
REVENUE & CASHFLOW PROFILE,Heat Price,29,3.59,cents/kWh
759+
REVENUE & CASHFLOW PROFILE,Heat Price,30,3.59,cents/kWh
760760
REVENUE & CASHFLOW PROFILE,Heat Ann. Rev.,1,0.0,MUSD/yr
761761
REVENUE & CASHFLOW PROFILE,Heat Ann. Rev.,2,0.0,MUSD/yr
762762
REVENUE & CASHFLOW PROFILE,Heat Ann. Rev.,3,0.0,MUSD/yr

‎tests/examples/example11_AC.out

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.4.29
8-
Simulation Date: 2024-05-15
9-
Simulation Time: 11:52
10-
Calculation Time: 0.106 sec
7+
GEOPHIRES Version: 3.4.31
8+
Simulation Date: 2024-06-17
9+
Simulation Time: 06:45
10+
Calculation Time: 0.110 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -211,32 +211,32 @@ Since Price Ann. Rev. Cumm. Rev. | Price Ann. Rev. Cumm. Rev. | Pr
211211
Start (cents/kWh)(MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(cents/kWh) (MUSD/yr) (MUSD) |(USD/tonne) (MUSD/yr) (MUSD) |(MUSD/yr) (MUSD/yr) (MUSD)
212212
________________________________________________________________________________________________________________________________________________________________________________________
213213
1 0.00 0.00 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 0.00 | 0.00 0.00 0.00 | 0.00 -29.74 -29.74
214-
2 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 3.00 | 0.00 0.00 0.00 | 0.58 2.41 -27.33
215-
3 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 5.99 | 0.00 0.00 0.00 | 0.58 2.41 -24.91
216-
4 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 8.99 | 0.00 0.00 0.00 | 0.58 2.41 -22.50
217-
5 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 11.99 | 0.00 0.00 0.00 | 0.58 2.41 -20.08
218-
6 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 14.98 | 0.00 0.00 0.00 | 0.58 2.41 -17.67
219-
7 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 17.98 | 0.00 0.00 0.00 | 0.58 2.41 -15.26
220-
8 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 20.97 | 0.00 0.00 0.00 | 0.58 2.41 -12.85
221-
9 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 23.97 | 0.00 0.00 0.00 | 0.58 2.41 -10.44
222-
10 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.41 26.96 | 0.00 0.00 0.00 | 0.58 2.41 -8.03
223-
11 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.40 29.94 | 0.00 0.00 0.00 | 0.58 2.40 -5.63
224-
12 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.39 32.92 | 0.00 0.00 0.00 | 0.58 2.39 -3.23
225-
13 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.39 35.88 | 0.00 0.00 0.00 | 0.58 2.39 -0.85
226-
14 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.37 38.84 | 0.00 0.00 0.00 | 0.58 2.37 1.53
227-
15 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.36 41.79 | 0.00 0.00 0.00 | 0.58 2.36 3.89
228-
16 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.35 44.72 | 0.00 0.00 0.00 | 0.58 2.35 6.24
229-
17 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.33 47.64 | 0.00 0.00 0.00 | 0.58 2.33 8.57
230-
18 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.32 50.54 | 0.00 0.00 0.00 | 0.58 2.32 10.89
231-
19 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.30 53.42 | 0.00 0.00 0.00 | 0.58 2.30 13.19
232-
20 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.28 56.29 | 0.00 0.00 0.00 | 0.58 2.28 15.48
233-
21 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.26 59.14 | 0.00 0.00 0.00 | 0.58 2.26 17.74
234-
22 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.25 61.96 | 0.00 0.00 0.00 | 0.58 2.25 19.99
235-
23 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.23 64.77 | 0.00 0.00 0.00 | 0.58 2.23 22.21
236-
24 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.21 67.56 | 0.00 0.00 0.00 | 0.58 2.21 24.42
237-
25 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.19 70.33 | 0.00 0.00 0.00 | 0.58 2.19 26.60
238-
26 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.16 73.08 | 0.00 0.00 0.00 | 0.58 2.16 28.77
239-
27 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.14 75.80 | 0.00 0.00 0.00 | 0.58 2.14 30.91
240-
28 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.12 78.51 | 0.00 0.00 0.00 | 0.58 2.12 33.03
241-
29 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.10 81.20 | 0.00 0.00 0.00 | 0.58 2.10 35.14
242-
30 5.50 0.00 0.00 | 6.55 0.00 0.00 | 6.55 2.08 83.86 | 0.00 0.00 0.00 | 0.58 2.08 37.22
214+
2 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 3.00 | 0.00 0.00 0.00 | 0.58 2.41 -27.33
215+
3 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 5.99 | 0.00 0.00 0.00 | 0.58 2.41 -24.91
216+
4 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 8.99 | 0.00 0.00 0.00 | 0.58 2.41 -22.50
217+
5 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 11.99 | 0.00 0.00 0.00 | 0.58 2.41 -20.08
218+
6 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 14.98 | 0.00 0.00 0.00 | 0.58 2.41 -17.67
219+
7 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 17.98 | 0.00 0.00 0.00 | 0.58 2.41 -15.26
220+
8 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 20.97 | 0.00 0.00 0.00 | 0.58 2.41 -12.85
221+
9 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 23.97 | 0.00 0.00 0.00 | 0.58 2.41 -10.44
222+
10 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.41 26.96 | 0.00 0.00 0.00 | 0.58 2.41 -8.03
223+
11 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.40 29.94 | 0.00 0.00 0.00 | 0.58 2.40 -5.63
224+
12 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.39 32.92 | 0.00 0.00 0.00 | 0.58 2.39 -3.23
225+
13 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.39 35.88 | 0.00 0.00 0.00 | 0.58 2.39 -0.85
226+
14 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.37 38.84 | 0.00 0.00 0.00 | 0.58 2.37 1.53
227+
15 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.36 41.79 | 0.00 0.00 0.00 | 0.58 2.36 3.89
228+
16 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.35 44.72 | 0.00 0.00 0.00 | 0.58 2.35 6.24
229+
17 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.33 47.64 | 0.00 0.00 0.00 | 0.58 2.33 8.57
230+
18 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.32 50.54 | 0.00 0.00 0.00 | 0.58 2.32 10.89
231+
19 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.30 53.42 | 0.00 0.00 0.00 | 0.58 2.30 13.19
232+
20 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.28 56.29 | 0.00 0.00 0.00 | 0.58 2.28 15.48
233+
21 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.26 59.14 | 0.00 0.00 0.00 | 0.58 2.26 17.74
234+
22 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.25 61.96 | 0.00 0.00 0.00 | 0.58 2.25 19.99
235+
23 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.23 64.77 | 0.00 0.00 0.00 | 0.58 2.23 22.21
236+
24 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.21 67.56 | 0.00 0.00 0.00 | 0.58 2.21 24.42
237+
25 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.19 70.33 | 0.00 0.00 0.00 | 0.58 2.19 26.60
238+
26 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.16 73.08 | 0.00 0.00 0.00 | 0.58 2.16 28.77
239+
27 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.14 75.80 | 0.00 0.00 0.00 | 0.58 2.14 30.91
240+
28 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.12 78.51 | 0.00 0.00 0.00 | 0.58 2.12 33.03
241+
29 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.10 81.20 | 0.00 0.00 0.00 | 0.58 2.10 35.14
242+
30 5.50 0.00 0.00 | 2.50 0.00 0.00 | 6.55 2.08 83.86 | 0.00 0.00 0.00 | 0.58 2.08 37.22

0 commit comments

Comments
 (0)