Skip to content

Commit 3b07381

Browse files
softwareengineerprogrammersoftwareengineerprogrammer
committed
Output first law effiency as 'Heat to power conversion efficiency'
1 parent 1701630 commit 3b07381

27 files changed

+116
-115
lines changed

‎src/geophires_x/Outputs.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,9 +1914,10 @@ def PrintOutputs(self, model: Model):
19141914

19151915
if model.surfaceplant.FirstLawEfficiency is not None:
19161916
avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100
1917+
first_law_efficiency_output_name = 'Heat to power conversion efficiency'
19171918
if avg_efficiency > 0: # 0 is presumed to mean N/A
19181919
f.write(
1919-
f' {model.surfaceplant.FirstLawEfficiency.Name}: {avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n')
1920+
f' {Outputs._field_label(first_law_efficiency_output_name, 50)}{avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n')
19201921

19211922
f.write(NL)
19221923
f.write(' ************************************************************\n')

‎src/geophires_x/SurfacePlant.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,8 @@ def __init__(self, model: Model):
486486
Name="First Law Efficiency",
487487
UnitType=Units.PERCENT,
488488
PreferredUnits=PercentUnit.PERCENT,
489-
CurrentUnits=PercentUnit.PERCENT
489+
CurrentUnits=PercentUnit.PERCENT,
490+
ToolTipText='Heat to power conversion efficiency'
490491
)
491492
self.HeatExtracted = self.OutputParameterDict[self.HeatExtracted.Name] = OutputParameter(
492493
Name="Heat Extracted",

‎src/geophires_x_schema_generator/geophires-request.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2086,7 +2086,7 @@
20862086
"type": "number",
20872087
"units": "%",
20882088
"category": "Economics",
2089-
"default": 7.00,
2089+
"default": 7.000000000000001,
20902090
"minimum": 0.0,
20912091
"maximum": 100.0
20922092
},

‎tests/example1_addons.csv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation
9898
SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh
9999
SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW
100100
SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,%
101-
SURFACE EQUIPMENT SIMULATION RESULTS,First Law Efficiency,,10.07,%
102101
Simulation Metadata,GEOPHIRES Version,,3.7.1,
103102
POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0,
104103
POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056,

‎tests/examples/Fervo_Norbeck_Latimer_2023.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.0
8-
Simulation Date: 2025-01-20
9-
Simulation Time: 11:32
10-
Calculation Time: 0.462 sec
7+
GEOPHIRES Version: 3.7.1
8+
Simulation Date: 2025-01-21
9+
Simulation Time: 14:14
10+
Calculation Time: 0.471 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -129,7 +129,7 @@ Simulation Metadata
129129
Average Annual Net Electricity Generation: 17.70 GWh
130130
Initial pumping power/net installed power: 28.16 %
131131
Average Pumping Power: 0.63 MW
132-
First Law Efficiency: 9.95 %
132+
Heat to power conversion efficiency: 9.95 %
133133

134134
************************************************************
135135
* HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *

‎tests/examples/Fervo_Project_Cape-2.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.0
8-
Simulation Date: 2025-01-20
9-
Simulation Time: 11:32
10-
Calculation Time: 0.688 sec
7+
GEOPHIRES Version: 3.7.1
8+
Simulation Date: 2025-01-21
9+
Simulation Time: 14:14
10+
Calculation Time: 0.689 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -127,7 +127,7 @@ Simulation Metadata
127127
Average Annual Net Electricity Generation: 69.67 GWh
128128
Initial pumping power/net installed power: 1.68 %
129129
Average Pumping Power: 0.15 MW
130-
First Law Efficiency: 16.00 %
130+
Heat to power conversion efficiency: 16.00 %
131131

132132
************************************************************
133133
* HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *

‎tests/examples/Fervo_Project_Cape-3.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.0
8-
Simulation Date: 2025-01-20
9-
Simulation Time: 11:32
10-
Calculation Time: 0.911 sec
7+
GEOPHIRES Version: 3.7.1
8+
Simulation Date: 2025-01-21
9+
Simulation Time: 14:14
10+
Calculation Time: 0.910 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -128,7 +128,7 @@ Simulation Metadata
128128
Average Annual Net Electricity Generation: 3171.75 GWh
129129
Initial pumping power/net installed power: 13.50 %
130130
Average Pumping Power: 53.73 MW
131-
First Law Efficiency: 14.39 %
131+
Heat to power conversion efficiency: 14.39 %
132132

133133
************************************************************
134134
* HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *

‎tests/examples/Fervo_Project_Cape.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.0
8-
Simulation Date: 2025-01-20
9-
Simulation Time: 11:32
10-
Calculation Time: 0.714 sec
7+
GEOPHIRES Version: 3.7.1
8+
Simulation Date: 2025-01-21
9+
Simulation Time: 14:14
10+
Calculation Time: 0.698 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -127,7 +127,7 @@ Simulation Metadata
127127
Average Annual Net Electricity Generation: 693.77 GWh
128128
Initial pumping power/net installed power: 19.31 %
129129
Average Pumping Power: 17.82 MW
130-
First Law Efficiency: 13.05 %
130+
Heat to power conversion efficiency: 13.05 %
131131

132132
************************************************************
133133
* HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *

‎tests/examples/S-DAC-GT.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.0
8-
Simulation Date: 2025-01-20
9-
Simulation Time: 11:32
7+
GEOPHIRES Version: 3.7.1
8+
Simulation Date: 2025-01-21
9+
Simulation Time: 14:14
1010
Calculation Time: 0.104 sec
1111

1212
***SUMMARY OF RESULTS***
@@ -128,7 +128,7 @@ Simulation Metadata
128128
Initial Net Heat Production: 14.05 MW
129129
Average Annual Heat Production: -4.73 GWh
130130
Average Pumping Power: 0.19 MW
131-
First Law Efficiency: 16.55 %
131+
Heat to power conversion efficiency: 16.55 %
132132

133133
************************************************************
134134
* HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *

‎tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out‎

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

55
Simulation Metadata
66
----------------------
7-
GEOPHIRES Version: 3.7.0
8-
Simulation Date: 2025-01-20
9-
Simulation Time: 11:32
10-
Calculation Time: 1.664 sec
7+
GEOPHIRES Version: 3.7.1
8+
Simulation Date: 2025-01-21
9+
Simulation Time: 14:14
10+
Calculation Time: 1.663 sec
1111

1212
***SUMMARY OF RESULTS***
1313

@@ -109,7 +109,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t
109109
Average Annual Net Electricity Generation: 8.63 GWh
110110
Initial pumping power/net installed power: 0.13 %
111111
Average Pumping Power: 0.00 MW
112-
First Law Efficiency: 5.16 %
112+
Heat to power conversion efficiency: 5.16 %
113113

114114
************************************************************
115115
* HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *

0 commit comments

Comments
 (0)