From 27c16f2b3f40c2532e320c3bbd0ac36e67b2357f Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Fri, 17 Jan 2025 11:27:15 -0800 Subject: [PATCH 01/19] Include first law efficiency (average) in surface equipment simulation results. WIP - pending unit test updates --- src/geophires_x/Outputs.py | 6 ++++++ src/geophires_x/SurfacePlantSingleFlash.py | 2 +- src/geophires_x_client/geophires_x_result.py | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 75fa7156..c29c825b 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -1912,6 +1912,12 @@ def PrintOutputs(self, model: Model): f.write(f' Average Pumping Power: {np.average(model.wellbores.PumpingPower.value):10.2f} {model.wellbores.PumpingPower.CurrentUnits.value}{NL}') + if model.surfaceplant.FirstLawEfficiency is not None: + avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100 + if avg_efficiency > 0: # 0 is presumed to mean N/A + f.write( + f' {model.surfaceplant.FirstLawEfficiency.Name}: {avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n') + f.write(NL) f.write(' ************************************************************\n') f.write(' * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE *\n') diff --git a/src/geophires_x/SurfacePlantSingleFlash.py b/src/geophires_x/SurfacePlantSingleFlash.py index bd845ab7..a5c45dc1 100644 --- a/src/geophires_x/SurfacePlantSingleFlash.py +++ b/src/geophires_x/SurfacePlantSingleFlash.py @@ -122,7 +122,7 @@ def Calculate(self, model: Model) -> None: self.NetElectricityProduced.value = self.ElectricityProduced.value - model.wellbores.PumpingPower.value self.FirstLawEfficiency.value = self.NetElectricityProduced.value/HeatExtractedTowardsElectricity - # Calculate annual electricity, pum;ping, and heat production + # Calculate annual electricity, pumping, and heat production self.HeatkWhExtracted.value, self.PumpingkWh.value, self.TotalkWhProduced.value, self.NetkWhProduced.value, self.HeatkWhProduced.value = \ SurfacePlant.annual_electricity_pumping_power(self, self.plant_lifetime.value, self.enduse_option.value, self.HeatExtracted.value, model.economics.timestepsperyear.value, self.utilization_factor.value, diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index b6457de3..29385f19 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -277,6 +277,7 @@ class GeophiresXResult: 'Maximum Peaking Boiler Heat Production', 'Average Peaking Boiler Heat Production', 'Minimum Peaking Boiler Heat Production', + 'First Law Efficiency', # AGS/CLGS 'Surface Plant Cost', 'Initial pumping power/net installed power', From 4a4b1553e0214df7248fc9b60865568c43bb230e Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Mon, 20 Jan 2025 11:41:38 -0800 Subject: [PATCH 02/19] Update example outputs to sync with Well depth output name update --- tests/example1_addons.csv | 1 + tests/examples/Fervo_Norbeck_Latimer_2023.out | 5 +++-- tests/examples/Fervo_Project_Cape-2.out | 5 +++-- tests/examples/Fervo_Project_Cape-3.out | 5 +++-- tests/examples/Fervo_Project_Cape.out | 5 +++-- tests/examples/S-DAC-GT.out | 5 +++-- .../Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out | 5 +++-- tests/examples/example1.out | 5 +++-- tests/examples/example13.out | 5 +++-- tests/examples/example1_addons.out | 5 +++-- tests/examples/example1_outputunits.out | 5 +++-- tests/examples/example3.out | 5 +++-- tests/examples/example4.out | 5 +++-- tests/examples/example9.out | 5 +++-- tests/examples/example_ITC.out | 5 +++-- tests/examples/example_PTC.out | 5 +++-- tests/examples/example_SBT_Hi_T.out | 5 +++-- tests/examples/example_SBT_Lo_T.out | 5 +++-- tests/examples/example_SHR-1.out | 5 +++-- tests/examples/example_SHR-2.out | 3 ++- tests/examples/example_multiple_gradients-2.out | 5 +++-- tests/examples/example_multiple_gradients.out | 5 +++-- tests/examples/example_overpressure.out | 5 +++-- tests/examples/example_overpressure2.out | 5 +++-- 24 files changed, 69 insertions(+), 45 deletions(-) diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 84e0b1e1..ee8a44f8 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -97,6 +97,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Initial Net Electricity Generation,,5.22,MW SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation,,43.85,GWh SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW +SURFACE EQUIPMENT SIMULATION RESULTS,First Law Efficiency,,10.07,% SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% Simulation Metadata,GEOPHIRES Version,,3.7.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out index 76d5d0a5..669be4c6 100644 --- a/tests/examples/Fervo_Norbeck_Latimer_2023.out +++ b/tests/examples/Fervo_Norbeck_Latimer_2023.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.454 sec + Simulation Time: 11:32 + Calculation Time: 0.462 sec ***SUMMARY OF RESULTS*** @@ -129,6 +129,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 17.70 GWh Initial pumping power/net installed power: 28.16 % Average Pumping Power: 0.63 MW + First Law Efficiency: 9.95 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape-2.out b/tests/examples/Fervo_Project_Cape-2.out index 9583bd75..22ca241e 100644 --- a/tests/examples/Fervo_Project_Cape-2.out +++ b/tests/examples/Fervo_Project_Cape-2.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.685 sec + Simulation Time: 11:32 + Calculation Time: 0.688 sec ***SUMMARY OF RESULTS*** @@ -127,6 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 69.67 GWh Initial pumping power/net installed power: 1.68 % Average Pumping Power: 0.15 MW + First Law Efficiency: 16.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape-3.out b/tests/examples/Fervo_Project_Cape-3.out index 10f6cf54..69787b41 100644 --- a/tests/examples/Fervo_Project_Cape-3.out +++ b/tests/examples/Fervo_Project_Cape-3.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.915 sec + Simulation Time: 11:32 + Calculation Time: 0.911 sec ***SUMMARY OF RESULTS*** @@ -128,6 +128,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 3171.75 GWh Initial pumping power/net installed power: 13.50 % Average Pumping Power: 53.73 MW + First Law Efficiency: 14.39 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape.out b/tests/examples/Fervo_Project_Cape.out index 6c422551..b07db74c 100644 --- a/tests/examples/Fervo_Project_Cape.out +++ b/tests/examples/Fervo_Project_Cape.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.688 sec + Simulation Time: 11:32 + Calculation Time: 0.714 sec ***SUMMARY OF RESULTS*** @@ -127,6 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 693.77 GWh Initial pumping power/net installed power: 19.31 % Average Pumping Power: 17.82 MW + First Law Efficiency: 13.05 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out index d44e454a..07708ebd 100644 --- a/tests/examples/S-DAC-GT.out +++ b/tests/examples/S-DAC-GT.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.106 sec + Simulation Time: 11:32 + Calculation Time: 0.104 sec ***SUMMARY OF RESULTS*** @@ -128,6 +128,7 @@ Simulation Metadata Initial Net Heat Production: 14.05 MW Average Annual Heat Production: -4.73 GWh Average Pumping Power: 0.19 MW + First Law Efficiency: 16.55 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out index a0a12121..87879a76 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 1.659 sec + Simulation Time: 11:32 + Calculation Time: 1.664 sec ***SUMMARY OF RESULTS*** @@ -109,6 +109,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Net Electricity Generation: 8.63 GWh Initial pumping power/net installed power: 0.13 % Average Pumping Power: 0.00 MW + First Law Efficiency: 5.16 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1.out b/tests/examples/example1.out index f37c0087..b8d0a50a 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 1.049 sec + Simulation Time: 11:30 + Calculation Time: 0.831 sec ***SUMMARY OF RESULTS*** @@ -126,6 +126,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.28 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW + First Law Efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example13.out b/tests/examples/example13.out index d24ccc51..67c6a113 100644 --- a/tests/examples/example13.out +++ b/tests/examples/example13.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.036 sec + Simulation Time: 11:30 + Calculation Time: 0.035 sec ***SUMMARY OF RESULTS*** @@ -132,6 +132,7 @@ Simulation Metadata Initial Net Heat Production: 19.63 MW Average Annual Heat Production: 108.31 GWh Average Pumping Power: 0.25 MW + First Law Efficiency: 7.58 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index c896258f..d800ac0f 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.825 sec + Simulation Time: 11:30 + Calculation Time: 0.821 sec ***SUMMARY OF RESULTS*** @@ -127,6 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.30 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW + First Law Efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1_outputunits.out b/tests/examples/example1_outputunits.out index a86a04f6..7c7fa71c 100644 --- a/tests/examples/example1_outputunits.out +++ b/tests/examples/example1_outputunits.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.820 sec + Simulation Time: 11:30 + Calculation Time: 0.845 sec ***SUMMARY OF RESULTS*** @@ -126,6 +126,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.28 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW + First Law Efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example3.out b/tests/examples/example3.out index f2f42175..d427f655 100644 --- a/tests/examples/example3.out +++ b/tests/examples/example3.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.120 sec + Simulation Time: 11:30 + Calculation Time: 0.123 sec ***SUMMARY OF RESULTS*** @@ -128,6 +128,7 @@ Simulation Metadata Initial Net Heat Production: 11.67 MW Average Annual Heat Production: 84.33 GWh Average Pumping Power: 0.20 MW + First Law Efficiency: 16.50 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example4.out b/tests/examples/example4.out index 9549f34a..e699b515 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.049 sec + Simulation Time: 11:30 + Calculation Time: 0.050 sec ***SUMMARY OF RESULTS*** @@ -124,6 +124,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 54.69 GWh Initial pumping power/net installed power: 15.60 % Average Pumping Power: 1.31 MW + First Law Efficiency: 7.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example9.out b/tests/examples/example9.out index b661655a..0cfa3ebe 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:50 - Calculation Time: 0.818 sec + Simulation Time: 11:32 + Calculation Time: 0.822 sec ***SUMMARY OF RESULTS*** @@ -128,6 +128,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 3.67 GWh Initial pumping power/net installed power: 16.55 % Average Pumping Power: 0.08 MW + First Law Efficiency: 4.64 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out index 7b322142..d46f1556 100644 --- a/tests/examples/example_ITC.out +++ b/tests/examples/example_ITC.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.819 sec + Simulation Time: 11:32 + Calculation Time: 0.814 sec ***SUMMARY OF RESULTS*** @@ -125,6 +125,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 147.70 GWh Initial pumping power/net installed power: 3.56 % Average Pumping Power: 0.64 MW + First Law Efficiency: 17.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out index a5313423..cb387351 100644 --- a/tests/examples/example_PTC.out +++ b/tests/examples/example_PTC.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.817 sec + Simulation Time: 11:30 + Calculation Time: 0.825 sec ***SUMMARY OF RESULTS*** @@ -124,6 +124,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 147.70 GWh Initial pumping power/net installed power: 3.56 % Average Pumping Power: 0.64 MW + First Law Efficiency: 17.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SBT_Hi_T.out b/tests/examples/example_SBT_Hi_T.out index 46b0c205..34bffd8b 100644 --- a/tests/examples/example_SBT_Hi_T.out +++ b/tests/examples/example_SBT_Hi_T.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 50.962 sec + Simulation Time: 11:32 + Calculation Time: 72.338 sec ***SUMMARY OF RESULTS*** @@ -108,6 +108,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Total Electricity Generation: 75.03 GWh Average Annual Net Electricity Generation: 75.03 GWh Average Pumping Power: 0.00 MW + First Law Efficiency: 17.15 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SBT_Lo_T.out b/tests/examples/example_SBT_Lo_T.out index 1e92ccf9..50a68456 100644 --- a/tests/examples/example_SBT_Lo_T.out +++ b/tests/examples/example_SBT_Lo_T.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 24.020 sec + Simulation Time: 11:30 + Calculation Time: 23.433 sec ***SUMMARY OF RESULTS*** @@ -108,6 +108,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Total Electricity Generation: 0.02 GWh Average Annual Net Electricity Generation: 0.02 GWh Average Pumping Power: 0.00 MW + First Law Efficiency: 0.27 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index e7df3d78..2fec7e7d 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.820 sec + Simulation Time: 11:32 + Calculation Time: 0.816 sec ***SUMMARY OF RESULTS*** @@ -123,6 +123,7 @@ Simulation Metadata Average Annual Total Electricity Generation: 241.59 GWh Average Annual Net Electricity Generation: 241.59 GWh Average Pumping Power: 0.00 MW + First Law Efficiency: 20.28 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index d896bf58..fc4b5b9a 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -6,7 +6,7 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 + Simulation Time: 11:32 Calculation Time: 0.551 sec ***SUMMARY OF RESULTS*** @@ -123,6 +123,7 @@ Simulation Metadata Average Annual Total Electricity Generation: 856.31 GWh Average Annual Net Electricity Generation: 856.31 GWh Average Pumping Power: 0.00 MW + First Law Efficiency: 35.83 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_multiple_gradients-2.out b/tests/examples/example_multiple_gradients-2.out index 9ee8e9c6..9482cd4d 100644 --- a/tests/examples/example_multiple_gradients-2.out +++ b/tests/examples/example_multiple_gradients-2.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:50 - Calculation Time: 0.824 sec + Simulation Time: 11:32 + Calculation Time: 0.819 sec ***SUMMARY OF RESULTS*** @@ -137,6 +137,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 62.72 GWh Initial pumping power/net installed power: 2.05 % Average Pumping Power: 0.19 MW + First Law Efficiency: 11.89 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index e46f09cd..d96a5173 100644 --- a/tests/examples/example_multiple_gradients.out +++ b/tests/examples/example_multiple_gradients.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:49 - Calculation Time: 0.820 sec + Simulation Time: 11:32 + Calculation Time: 0.831 sec ***SUMMARY OF RESULTS*** @@ -137,6 +137,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 62.72 GWh Initial pumping power/net installed power: 2.05 % Average Pumping Power: 0.19 MW + First Law Efficiency: 11.89 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out index d5ba3f63..92704e18 100644 --- a/tests/examples/example_overpressure.out +++ b/tests/examples/example_overpressure.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.857 sec + Simulation Time: 11:30 + Calculation Time: 0.821 sec ***SUMMARY OF RESULTS*** @@ -127,6 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 40.92 GWh Initial pumping power/net installed power: 3.71 % Average Pumping Power: 0.87 MW + First Law Efficiency: 8.26 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out index f2425b5a..6da0f71d 100644 --- a/tests/examples/example_overpressure2.out +++ b/tests/examples/example_overpressure2.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.0 Simulation Date: 2025-01-20 - Simulation Time: 10:48 - Calculation Time: 0.821 sec + Simulation Time: 11:30 + Calculation Time: 0.843 sec ***SUMMARY OF RESULTS*** @@ -127,6 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 41.88 GWh Initial pumping power/net installed power: 3.71 % Average Pumping Power: 0.75 MW + First Law Efficiency: 8.45 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * From 2dfb4a93b69dde864dbebd5e44e760d77dc40e8a Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:30:50 -0800 Subject: [PATCH 03/19] =?UTF-8?q?Bump=20version:=203.7.0=20=E2=86=92=203.7?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5e85f5fa..6b5545f4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.0 +current_version = 3.7.1 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 659adb46..ba802b44 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.7.0 + version: 3.7.1 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 693f17d8..a267bed3 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.1.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.0...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.1...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 9fd7d385..1fb750a0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2024' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.0' +version = release = '3.7.1' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index 8d089863..da6964ef 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.0', + version='3.7.1', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 8c3336cc..380cd80a 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.0' +__version__ = '3.7.1' From 8c1b88db65b490b6b49006d5d53d69ee126a767a Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:46:44 -0800 Subject: [PATCH 04/19] =?UTF-8?q?Revert=20"Bump=20version:=203.7.0=20?= =?UTF-8?q?=E2=86=92=203.7.1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2dfb4a93b69dde864dbebd5e44e760d77dc40e8a. --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6b5545f4..5e85f5fa 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.1 +current_version = 3.7.0 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index ba802b44..659adb46 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.7.1 + version: 3.7.0 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index a267bed3..693f17d8 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.0.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.1...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.0...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 1fb750a0..9fd7d385 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2024' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.1' +version = release = '3.7.0' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index da6964ef..8d089863 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.1', + version='3.7.0', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 380cd80a..8c3336cc 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.1' +__version__ = '3.7.0' From f8d6821c33bec99917d3a80fcda65b2dac1f8120 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:48:05 -0800 Subject: [PATCH 05/19] Order efficiency after pumping power fields --- src/geophires_x_client/geophires_x_result.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index 29385f19..b85863ae 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -277,10 +277,10 @@ class GeophiresXResult: 'Maximum Peaking Boiler Heat Production', 'Average Peaking Boiler Heat Production', 'Minimum Peaking Boiler Heat Production', + 'Initial pumping power/net installed power', 'First Law Efficiency', # AGS/CLGS 'Surface Plant Cost', - 'Initial pumping power/net installed power', # SUTRA 'Average RTES Heating Production', 'Average Auxiliary Heating Production', From c136659d97d82587b1cfa5f034c32379f034cb61 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:50:53 -0800 Subject: [PATCH 06/19] =?UTF-8?q?Bump=20version:=203.7.0=20=E2=86=92=203.7?= =?UTF-8?q?.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 5e85f5fa..6b5545f4 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.0 +current_version = 3.7.1 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 659adb46..ba802b44 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.7.0 + version: 3.7.1 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 693f17d8..a267bed3 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.1.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.0...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.1...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 9fd7d385..1fb750a0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2024' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.0' +version = release = '3.7.1' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index 8d089863..da6964ef 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.0', + version='3.7.1', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 8c3336cc..380cd80a 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.0' +__version__ = '3.7.1' From c9125b56d0fa90861ffa194fedfc11b04687b1a9 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 07:58:05 -0800 Subject: [PATCH 07/19] Fix CSV unit test --- tests/example1_addons.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index ee8a44f8..27fdc4a8 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -97,8 +97,8 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Initial Net Electricity Generation,,5.22,MW SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation,,43.85,GWh SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW -SURFACE EQUIPMENT SIMULATION RESULTS,First Law Efficiency,,10.07,% SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% +SURFACE EQUIPMENT SIMULATION RESULTS,First Law Efficiency,,10.07,% Simulation Metadata,GEOPHIRES Version,,3.7.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, From 6120f89111cf82abb41b02925bf941313d41cbbd Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:18:33 -0800 Subject: [PATCH 08/19] Regenerate example1_addons.csv when "regenerate-example.result.sh example1_addons" is run --- tests/example1_addons.csv | 2 +- tests/examples/example1_addons.out | 8 ++++---- tests/regenerate-example-result.ps1 | 2 ++ tests/regenerate-example-result.sh | 6 ++++++ tests/regenerate_example_result_csv.py | 13 +++++++++++++ tests/test_geophires_x_client.py | 11 ++++++----- 6 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 tests/regenerate_example_result_csv.py diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 27fdc4a8..40b40d8d 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -99,7 +99,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,, SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% SURFACE EQUIPMENT SIMULATION RESULTS,First Law Efficiency,,10.07,% -Simulation Metadata,GEOPHIRES Version,,3.7.0, +Simulation Metadata,GEOPHIRES Version,,3.7.1, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, POWER GENERATION PROFILE,THERMAL DRAWDOWN,3,1.0073, diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index d800ac0f..c04bbf32 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.821 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 08:07 + Calculation Time: 0.814 sec ***SUMMARY OF RESULTS*** diff --git a/tests/regenerate-example-result.ps1 b/tests/regenerate-example-result.ps1 index 8ac41967..41bceb74 100644 --- a/tests/regenerate-example-result.ps1 +++ b/tests/regenerate-example-result.ps1 @@ -31,3 +31,5 @@ cd .. #./tests/regenerate-example-result.ps1 example_SHR-2 #./tests/regenerate-example-result.ps1 Fervo_Norbeck_Latimer_2024 #./tests/regenerate-example-result.ps1 Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery + +# TODO regenerate CSV for example1_addons as in regenerate-example-result.sh diff --git a/tests/regenerate-example-result.sh b/tests/regenerate-example-result.sh index 55b05dba..be7624a7 100755 --- a/tests/regenerate-example-result.sh +++ b/tests/regenerate-example-result.sh @@ -12,3 +12,9 @@ cd "$(dirname "$0")" python -mgeophires_x examples/$1.txt examples/$1.out rm examples/$1.json + +if [[ $1 == "example1_addons" ]] +then + echo "Updating CSV..." + python regenerate_example_result_csv.py +fi diff --git a/tests/regenerate_example_result_csv.py b/tests/regenerate_example_result_csv.py new file mode 100644 index 00000000..0e33468c --- /dev/null +++ b/tests/regenerate_example_result_csv.py @@ -0,0 +1,13 @@ +import os +from pathlib import Path + +from geophires_x_client import GeophiresXResult + + +def _get_file_path(file_name: str | Path) -> str: + return os.path.join(os.path.abspath(os.path.dirname(__file__)), str(file_name)) + + +if __name__ == '__main__': + with open(_get_file_path('example1_addons.csv'), 'w', encoding='utf-8') as csvfile: + csvfile.write(GeophiresXResult(_get_file_path('examples/example1_addons.out')).as_csv()) diff --git a/tests/test_geophires_x_client.py b/tests/test_geophires_x_client.py index a5ecd6c1..533cedac 100644 --- a/tests/test_geophires_x_client.py +++ b/tests/test_geophires_x_client.py @@ -456,12 +456,13 @@ def test_input_with_non_default_units(self): def test_csv(self): """ - TODO make this less tedious to update when expected result values change + Note: example1_addons.csv will be updated automatically when `regenerate-example-result.sh example1_addons` is + run. - Current easiest method to update: - 1. set breakpoint on line after `as_csv = result.as_csv()` - 2. debug test, hit break point - 3. copy-paste value of `as_csv` to example1_addons.csv + If needed, example1_addons.csv can also be updated manually with the following steps: + 1. In your IDE, set a breakpoint on the line after `as_csv = result.as_csv()` + 2. Debug this test and hit the break point + 3. Copy-paste the value of `as_csv` (in Threads & Variables tab in PyCharm) to example1_addons.csv """ def assertFileContentsEqual(expected_file_path, actual_file_path, tol=0.01): From 1701630aec737ade1aba2d17d406c53652a24667 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 08:53:03 -0800 Subject: [PATCH 09/19] Fix python<=3.9-incompatible type annotation --- tests/regenerate_example_result_csv.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/regenerate_example_result_csv.py b/tests/regenerate_example_result_csv.py index 0e33468c..0c8319a9 100644 --- a/tests/regenerate_example_result_csv.py +++ b/tests/regenerate_example_result_csv.py @@ -1,10 +1,9 @@ import os -from pathlib import Path from geophires_x_client import GeophiresXResult -def _get_file_path(file_name: str | Path) -> str: +def _get_file_path(file_name: str) -> str: return os.path.join(os.path.abspath(os.path.dirname(__file__)), str(file_name)) From 3b0738169d6a436a6d014f8f88c11c6b67c7cbe3 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Tue, 21 Jan 2025 14:16:19 -0800 Subject: [PATCH 10/19] Output first law effiency as 'Heat to power conversion efficiency' --- src/geophires_x/Outputs.py | 3 ++- src/geophires_x/SurfacePlant.py | 3 ++- .../geophires-request.json | 2 +- tests/example1_addons.csv | 1 - tests/examples/Fervo_Norbeck_Latimer_2023.out | 10 +++++----- tests/examples/Fervo_Project_Cape-2.out | 10 +++++----- tests/examples/Fervo_Project_Cape-3.out | 10 +++++----- tests/examples/Fervo_Project_Cape.out | 10 +++++----- tests/examples/S-DAC-GT.out | 8 ++++---- ...nju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out | 10 +++++----- tests/examples/example1.out | 10 +++++----- tests/examples/example13.out | 10 +++++----- tests/examples/example1_addons.out | 6 +++--- tests/examples/example1_outputunits.out | 10 +++++----- tests/examples/example3.out | 8 ++++---- tests/examples/example4.out | 10 +++++----- tests/examples/example9.out | 10 +++++----- tests/examples/example_ITC.out | 10 +++++----- tests/examples/example_PTC.out | 10 +++++----- tests/examples/example_SBT_Hi_T.out | 10 +++++----- tests/examples/example_SBT_Lo_T.out | 10 +++++----- tests/examples/example_SHR-1.out | 10 +++++----- tests/examples/example_SHR-2.out | 10 +++++----- tests/examples/example_multiple_gradients-2.out | 10 +++++----- tests/examples/example_multiple_gradients.out | 10 +++++----- tests/examples/example_overpressure.out | 10 +++++----- tests/examples/example_overpressure2.out | 10 +++++----- 27 files changed, 116 insertions(+), 115 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index c29c825b..df915e13 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -1914,9 +1914,10 @@ def PrintOutputs(self, model: Model): if model.surfaceplant.FirstLawEfficiency is not None: avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100 + first_law_efficiency_output_name = 'Heat to power conversion efficiency' if avg_efficiency > 0: # 0 is presumed to mean N/A f.write( - f' {model.surfaceplant.FirstLawEfficiency.Name}: {avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n') + f' {Outputs._field_label(first_law_efficiency_output_name, 50)}{avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n') f.write(NL) f.write(' ************************************************************\n') diff --git a/src/geophires_x/SurfacePlant.py b/src/geophires_x/SurfacePlant.py index a6514c22..a9fbd2e9 100644 --- a/src/geophires_x/SurfacePlant.py +++ b/src/geophires_x/SurfacePlant.py @@ -486,7 +486,8 @@ def __init__(self, model: Model): Name="First Law Efficiency", UnitType=Units.PERCENT, PreferredUnits=PercentUnit.PERCENT, - CurrentUnits=PercentUnit.PERCENT + CurrentUnits=PercentUnit.PERCENT, + ToolTipText='Heat to power conversion efficiency' ) self.HeatExtracted = self.OutputParameterDict[self.HeatExtracted.Name] = OutputParameter( Name="Heat Extracted", diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json index 0db11c3f..9e69227b 100644 --- a/src/geophires_x_schema_generator/geophires-request.json +++ b/src/geophires_x_schema_generator/geophires-request.json @@ -2086,7 +2086,7 @@ "type": "number", "units": "%", "category": "Economics", - "default": 7.00, + "default": 7.000000000000001, "minimum": 0.0, "maximum": 100.0 }, diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index 40b40d8d..fa1577fc 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -98,7 +98,6 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% -SURFACE EQUIPMENT SIMULATION RESULTS,First Law Efficiency,,10.07,% Simulation Metadata,GEOPHIRES Version,,3.7.1, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out index 669be4c6..c22b75a1 100644 --- a/tests/examples/Fervo_Norbeck_Latimer_2023.out +++ b/tests/examples/Fervo_Norbeck_Latimer_2023.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.462 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.471 sec ***SUMMARY OF RESULTS*** @@ -129,7 +129,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 17.70 GWh Initial pumping power/net installed power: 28.16 % Average Pumping Power: 0.63 MW - First Law Efficiency: 9.95 % + Heat to power conversion efficiency: 9.95 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape-2.out b/tests/examples/Fervo_Project_Cape-2.out index 22ca241e..70d9a521 100644 --- a/tests/examples/Fervo_Project_Cape-2.out +++ b/tests/examples/Fervo_Project_Cape-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.688 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.689 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 69.67 GWh Initial pumping power/net installed power: 1.68 % Average Pumping Power: 0.15 MW - First Law Efficiency: 16.00 % + Heat to power conversion efficiency: 16.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape-3.out b/tests/examples/Fervo_Project_Cape-3.out index 69787b41..65f9a0d3 100644 --- a/tests/examples/Fervo_Project_Cape-3.out +++ b/tests/examples/Fervo_Project_Cape-3.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.911 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.910 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 3171.75 GWh Initial pumping power/net installed power: 13.50 % Average Pumping Power: 53.73 MW - First Law Efficiency: 14.39 % + Heat to power conversion efficiency: 14.39 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape.out b/tests/examples/Fervo_Project_Cape.out index b07db74c..f91b3477 100644 --- a/tests/examples/Fervo_Project_Cape.out +++ b/tests/examples/Fervo_Project_Cape.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.714 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.698 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 693.77 GWh Initial pumping power/net installed power: 19.31 % Average Pumping Power: 17.82 MW - First Law Efficiency: 13.05 % + Heat to power conversion efficiency: 13.05 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out index 07708ebd..89acee65 100644 --- a/tests/examples/S-DAC-GT.out +++ b/tests/examples/S-DAC-GT.out @@ -4,9 +4,9 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 Calculation Time: 0.104 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Initial Net Heat Production: 14.05 MW Average Annual Heat Production: -4.73 GWh Average Pumping Power: 0.19 MW - First Law Efficiency: 16.55 % + Heat to power conversion efficiency: 16.55 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out index 87879a76..9a3161e1 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 1.664 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 1.663 sec ***SUMMARY OF RESULTS*** @@ -109,7 +109,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Net Electricity Generation: 8.63 GWh Initial pumping power/net installed power: 0.13 % Average Pumping Power: 0.00 MW - First Law Efficiency: 5.16 % + Heat to power conversion efficiency: 5.16 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1.out b/tests/examples/example1.out index b8d0a50a..f372e642 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.831 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.838 sec ***SUMMARY OF RESULTS*** @@ -126,7 +126,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.28 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW - First Law Efficiency: 10.07 % + Heat to power conversion efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example13.out b/tests/examples/example13.out index 67c6a113..7ac87494 100644 --- a/tests/examples/example13.out +++ b/tests/examples/example13.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.035 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.037 sec ***SUMMARY OF RESULTS*** @@ -132,7 +132,7 @@ Simulation Metadata Initial Net Heat Production: 19.63 MW Average Annual Heat Production: 108.31 GWh Average Pumping Power: 0.25 MW - First Law Efficiency: 7.58 % + Heat to power conversion efficiency: 7.58 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index c04bbf32..b8ea6001 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -6,8 +6,8 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 Simulation Date: 2025-01-21 - Simulation Time: 08:07 - Calculation Time: 0.814 sec + Simulation Time: 14:13 + Calculation Time: 0.818 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.30 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW - First Law Efficiency: 10.07 % + Heat to power conversion efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1_outputunits.out b/tests/examples/example1_outputunits.out index 7c7fa71c..6d42ab5e 100644 --- a/tests/examples/example1_outputunits.out +++ b/tests/examples/example1_outputunits.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.845 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.836 sec ***SUMMARY OF RESULTS*** @@ -126,7 +126,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.28 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW - First Law Efficiency: 10.07 % + Heat to power conversion efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example3.out b/tests/examples/example3.out index d427f655..2558e2c9 100644 --- a/tests/examples/example3.out +++ b/tests/examples/example3.out @@ -4,9 +4,9 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 Calculation Time: 0.123 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Initial Net Heat Production: 11.67 MW Average Annual Heat Production: 84.33 GWh Average Pumping Power: 0.20 MW - First Law Efficiency: 16.50 % + Heat to power conversion efficiency: 16.50 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example4.out b/tests/examples/example4.out index e699b515..5888287b 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.050 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.054 sec ***SUMMARY OF RESULTS*** @@ -124,7 +124,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 54.69 GWh Initial pumping power/net installed power: 15.60 % Average Pumping Power: 1.31 MW - First Law Efficiency: 7.30 % + Heat to power conversion efficiency: 7.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example9.out b/tests/examples/example9.out index 0cfa3ebe..c2346fa2 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.822 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.835 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 3.67 GWh Initial pumping power/net installed power: 16.55 % Average Pumping Power: 0.08 MW - First Law Efficiency: 4.64 % + Heat to power conversion efficiency: 4.64 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out index d46f1556..4e0e707d 100644 --- a/tests/examples/example_ITC.out +++ b/tests/examples/example_ITC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.814 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.822 sec ***SUMMARY OF RESULTS*** @@ -125,7 +125,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 147.70 GWh Initial pumping power/net installed power: 3.56 % Average Pumping Power: 0.64 MW - First Law Efficiency: 17.30 % + Heat to power conversion efficiency: 17.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out index cb387351..25dcd884 100644 --- a/tests/examples/example_PTC.out +++ b/tests/examples/example_PTC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.825 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.833 sec ***SUMMARY OF RESULTS*** @@ -124,7 +124,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 147.70 GWh Initial pumping power/net installed power: 3.56 % Average Pumping Power: 0.64 MW - First Law Efficiency: 17.30 % + Heat to power conversion efficiency: 17.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SBT_Hi_T.out b/tests/examples/example_SBT_Hi_T.out index 34bffd8b..112bb098 100644 --- a/tests/examples/example_SBT_Hi_T.out +++ b/tests/examples/example_SBT_Hi_T.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 72.338 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 35.137 sec ***SUMMARY OF RESULTS*** @@ -108,7 +108,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Total Electricity Generation: 75.03 GWh Average Annual Net Electricity Generation: 75.03 GWh Average Pumping Power: 0.00 MW - First Law Efficiency: 17.15 % + Heat to power conversion efficiency: 17.15 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SBT_Lo_T.out b/tests/examples/example_SBT_Lo_T.out index 50a68456..c967dd68 100644 --- a/tests/examples/example_SBT_Lo_T.out +++ b/tests/examples/example_SBT_Lo_T.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 23.433 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 15.861 sec ***SUMMARY OF RESULTS*** @@ -108,7 +108,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Total Electricity Generation: 0.02 GWh Average Annual Net Electricity Generation: 0.02 GWh Average Pumping Power: 0.00 MW - First Law Efficiency: 0.27 % + Heat to power conversion efficiency: 0.27 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index 2fec7e7d..6e9d377b 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.816 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.855 sec ***SUMMARY OF RESULTS*** @@ -123,7 +123,7 @@ Simulation Metadata Average Annual Total Electricity Generation: 241.59 GWh Average Annual Net Electricity Generation: 241.59 GWh Average Pumping Power: 0.00 MW - First Law Efficiency: 20.28 % + Heat to power conversion efficiency: 20.28 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index fc4b5b9a..64b178c2 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.551 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.550 sec ***SUMMARY OF RESULTS*** @@ -123,7 +123,7 @@ Simulation Metadata Average Annual Total Electricity Generation: 856.31 GWh Average Annual Net Electricity Generation: 856.31 GWh Average Pumping Power: 0.00 MW - First Law Efficiency: 35.83 % + Heat to power conversion efficiency: 35.83 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_multiple_gradients-2.out b/tests/examples/example_multiple_gradients-2.out index 9482cd4d..4bafe464 100644 --- a/tests/examples/example_multiple_gradients-2.out +++ b/tests/examples/example_multiple_gradients-2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.819 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.851 sec ***SUMMARY OF RESULTS*** @@ -137,7 +137,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 62.72 GWh Initial pumping power/net installed power: 2.05 % Average Pumping Power: 0.19 MW - First Law Efficiency: 11.89 % + Heat to power conversion efficiency: 11.89 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index d96a5173..4060353e 100644 --- a/tests/examples/example_multiple_gradients.out +++ b/tests/examples/example_multiple_gradients.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:32 - Calculation Time: 0.831 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:14 + Calculation Time: 0.819 sec ***SUMMARY OF RESULTS*** @@ -137,7 +137,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 62.72 GWh Initial pumping power/net installed power: 2.05 % Average Pumping Power: 0.19 MW - First Law Efficiency: 11.89 % + Heat to power conversion efficiency: 11.89 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out index 92704e18..3aa78577 100644 --- a/tests/examples/example_overpressure.out +++ b/tests/examples/example_overpressure.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.821 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.845 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 40.92 GWh Initial pumping power/net installed power: 3.71 % Average Pumping Power: 0.87 MW - First Law Efficiency: 8.26 % + Heat to power conversion efficiency: 8.26 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out index 6da0f71d..789895a7 100644 --- a/tests/examples/example_overpressure2.out +++ b/tests/examples/example_overpressure2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.0 - Simulation Date: 2025-01-20 - Simulation Time: 11:30 - Calculation Time: 0.843 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-21 + Simulation Time: 14:13 + Calculation Time: 0.830 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 41.88 GWh Initial pumping power/net installed power: 3.71 % Average Pumping Power: 0.75 MW - First Law Efficiency: 8.45 % + Heat to power conversion efficiency: 8.45 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * From 7953430065f10e0b33bdf421ab98333fbde7153f Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:20:34 -0800 Subject: [PATCH 11/19] Include description in output parameter docs --- src/geophires_x/Parameter.py | 2 +- src/geophires_x_schema_generator/__init__.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/geophires_x/Parameter.py b/src/geophires_x/Parameter.py index 5f3f2aaa..8faa4c20 100644 --- a/src/geophires_x/Parameter.py +++ b/src/geophires_x/Parameter.py @@ -64,7 +64,7 @@ class OutputParameter(HasQuantity): Name: str = "" value: int = 0 - ToolTipText: str = "This is ToolTip Text" + ToolTipText: str = "" UnitType: IntEnum = Units.NONE PreferredUnits: Enum = Units.NONE # set to PreferredUnits by default assuming that the current units are the preferred units - diff --git a/src/geophires_x_schema_generator/__init__.py b/src/geophires_x_schema_generator/__init__.py index fe4485b1..fd94e27e 100644 --- a/src/geophires_x_schema_generator/__init__.py +++ b/src/geophires_x_schema_generator/__init__.py @@ -210,6 +210,7 @@ def get_output_params_table_rst(self, output_params_json) -> str: :header-rows: 1 * - Name + - Description - Preferred Units - Default Value Type""" @@ -223,6 +224,7 @@ def get_key(k): return '' output_rst += f"""\n * - {param['Name']} + - {get_key('ToolTipText')} - {get_key('PreferredUnits')} - {get_key('json_parameter_type')}""" From 1520f0a587492bd873b27b22bf0a72bfb62061cf Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 09:36:33 -0800 Subject: [PATCH 12/19] Fix floating point errors in default/min/max values in schema generation --- src/geophires_x_schema_generator/__init__.py | 15 ++++++++++++--- .../geophires-request.json | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/geophires_x_schema_generator/__init__.py b/src/geophires_x_schema_generator/__init__.py index fd94e27e..12707379 100644 --- a/src/geophires_x_schema_generator/__init__.py +++ b/src/geophires_x_schema_generator/__init__.py @@ -112,7 +112,7 @@ def generate_json_schema(self) -> dict: 'type': param['json_parameter_type'], 'units': units_val, 'category': param['parameter_category'], - 'default': param['DefaultValue'], + 'default': _fix_floating_point_error(param['DefaultValue']), 'minimum': min_val, 'maximum': max_val, } @@ -168,13 +168,15 @@ def get_input_params_table(category_params, category_name) -> str: # if param['Required']: # TODO designate required params + default_value = _fix_floating_point_error(_get_key(param, 'DefaultValue')) + min_val, max_val = _get_min_and_max(param) input_rst += f"""\n * - {param['Name']} - {_get_key(param, 'ToolTipText')} - {_get_key(param, 'PreferredUnits')} - {_get_key(param, 'json_parameter_type')} - - {_get_key(param, 'DefaultValue')} + - {default_value} - {min_val} - {max_val}""" @@ -247,7 +249,14 @@ def _get_min_and_max(param: dict, default_val='') -> Tuple: min_val = min(param['AllowableRange']) max_val = max(param['AllowableRange']) - return (min_val, max_val) + return _fix_floating_point_error(min_val), _fix_floating_point_error(max_val) + + +def _fix_floating_point_error(val: Any) -> Any: + if '.0000' in str(val): + return format(float(val), '.1f') + + return val class HipRaXSchemaGenerator(GeophiresXSchemaGenerator): diff --git a/src/geophires_x_schema_generator/geophires-request.json b/src/geophires_x_schema_generator/geophires-request.json index 9e69227b..395fa8d6 100644 --- a/src/geophires_x_schema_generator/geophires-request.json +++ b/src/geophires_x_schema_generator/geophires-request.json @@ -726,7 +726,7 @@ "category": "Well Bores", "default": 1.0, "minimum": 0.0, - "maximum": 1.000001 + "maximum": "1.0" }, "Is AGS": { "description": "Set to true if the model is for an Advanced Geothermal System (AGS)", @@ -2086,7 +2086,7 @@ "type": "number", "units": "%", "category": "Economics", - "default": 7.000000000000001, + "default": "7.0", "minimum": 0.0, "maximum": 100.0 }, From de28e0b5658726c47573e5bb23d754103f5d352c Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 10:47:12 -0800 Subject: [PATCH 13/19] Define 'Heat to Power Conversion Efficiency' as a separate output that is calculated in _calculate_derived_outputs. --- src/geophires_x/Outputs.py | 10 ++++---- src/geophires_x/SurfacePlant.py | 23 ++++++++++++++++++- src/geophires_x/SurfacePlantAGS.py | 1 + .../SurfacePlantAbsorptionChiller.py | 2 ++ .../SurfacePlantDistrictHeating.py | 1 + src/geophires_x/SurfacePlantDoubleFlash.py | 1 + src/geophires_x/SurfacePlantHeatPump.py | 3 ++- src/geophires_x/SurfacePlantIndustrialHeat.py | 3 ++- src/geophires_x/SurfacePlantSUTRA.py | 1 + src/geophires_x/SurfacePlantSingleFlash.py | 3 ++- src/geophires_x/SurfacePlantSubcriticalORC.py | 3 ++- .../SurfacePlantSupercriticalORC.py | 3 ++- src/geophires_x_client/geophires_x_result.py | 2 +- 13 files changed, 43 insertions(+), 13 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index df915e13..4064951c 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -1912,12 +1912,10 @@ def PrintOutputs(self, model: Model): f.write(f' Average Pumping Power: {np.average(model.wellbores.PumpingPower.value):10.2f} {model.wellbores.PumpingPower.CurrentUnits.value}{NL}') - if model.surfaceplant.FirstLawEfficiency is not None: - avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100 - first_law_efficiency_output_name = 'Heat to power conversion efficiency' - if avg_efficiency > 0: # 0 is presumed to mean N/A - f.write( - f' {Outputs._field_label(first_law_efficiency_output_name, 50)}{avg_efficiency:10.2f} {model.surfaceplant.FirstLawEfficiency.CurrentUnits.value}\n') + if model.surfaceplant.heat_to_power_conversion_efficiency.value is not None: + hpce = model.surfaceplant.heat_to_power_conversion_efficiency + f.write(f' {Outputs._field_label(hpce.Name, 50)}' + f'{hpce.value:10.2f} {model.surfaceplant.heat_to_power_conversion_efficiency.CurrentUnits.value}\n') f.write(NL) f.write(' ************************************************************\n') diff --git a/src/geophires_x/SurfacePlant.py b/src/geophires_x/SurfacePlant.py index a9fbd2e9..22eb5a2a 100644 --- a/src/geophires_x/SurfacePlant.py +++ b/src/geophires_x/SurfacePlant.py @@ -487,7 +487,14 @@ def __init__(self, model: Model): UnitType=Units.PERCENT, PreferredUnits=PercentUnit.PERCENT, CurrentUnits=PercentUnit.PERCENT, - ToolTipText='Heat to power conversion efficiency' + ToolTipText='Net electricity produced divided by heat extracted towards electricity' + ) + self.heat_to_power_conversion_efficiency = self.OutputParameterDict[self.heat_to_power_conversion_efficiency.Name] = OutputParameter( + Name='Heat to Power Conversion Efficiency', + UnitType=Units.PERCENT, + PreferredUnits=PercentUnit.PERCENT, + CurrentUnits=PercentUnit.PERCENT, + ToolTipText='First law efficiency average over project lifetime' ) self.HeatExtracted = self.OutputParameterDict[self.HeatExtracted.Name] = OutputParameter( Name="Heat Extracted", @@ -637,4 +644,18 @@ def Calculate(self, model: Model) -> None: # All calculations are handled in subclasses of this class, so this function is empty. + # Subclasses should call _calculate_derived_outputs at the end of their Calculate methods. + self._calculate_derived_outputs(model) + model.logger.info(f'Complete {self.__class__.__name__}: {__name__}') + + def _calculate_derived_outputs(self, model: Model) -> None: + """ + Subclasses should call _calculate_derived_outputs at the end of their Calculate methods to populate output + values that are derived from subclass-calculated outputs. + """ + + if self.FirstLawEfficiency is not None: + avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100 # TODO proper unit conversion + if avg_efficiency > 0: # 0 is presumed to mean N/A + self.heat_to_power_conversion_efficiency.value = avg_efficiency diff --git a/src/geophires_x/SurfacePlantAGS.py b/src/geophires_x/SurfacePlantAGS.py index eb35e2d6..ee666e01 100644 --- a/src/geophires_x/SurfacePlantAGS.py +++ b/src/geophires_x/SurfacePlantAGS.py @@ -783,4 +783,5 @@ def Calculate(self, model: Model) -> None: print(f'Error: {class_file_info_msg}. Exiting....') raise RuntimeError(base_msg) + self._calculate_derived_outputs(model) model.logger.info(f"complete {str(__class__)}: {sys._getframe().f_code.co_name}") diff --git a/src/geophires_x/SurfacePlantAbsorptionChiller.py b/src/geophires_x/SurfacePlantAbsorptionChiller.py index a382dc99..faf17757 100644 --- a/src/geophires_x/SurfacePlantAbsorptionChiller.py +++ b/src/geophires_x/SurfacePlantAbsorptionChiller.py @@ -141,4 +141,6 @@ def Calculate(self, model: Model) -> None: # calculate reservoir heat content self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) + + self._calculate_derived_outputs(model) model.logger.info(f"complete {self.__class__.__name__}: {__name__}") diff --git a/src/geophires_x/SurfacePlantDistrictHeating.py b/src/geophires_x/SurfacePlantDistrictHeating.py index 0851ff62..a4a9e8b4 100644 --- a/src/geophires_x/SurfacePlantDistrictHeating.py +++ b/src/geophires_x/SurfacePlantDistrictHeating.py @@ -249,6 +249,7 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) + self._calculate_derived_outputs(model) model.logger.info(f"Complete {self.__class__.__name__}: {__name__}") # district heating routines below diff --git a/src/geophires_x/SurfacePlantDoubleFlash.py b/src/geophires_x/SurfacePlantDoubleFlash.py index 238067d5..1b40822e 100644 --- a/src/geophires_x/SurfacePlantDoubleFlash.py +++ b/src/geophires_x/SurfacePlantDoubleFlash.py @@ -133,4 +133,5 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) + self._calculate_derived_outputs(model) model.logger.info(f'complete {self.__class__.__name__}: {__name__}') diff --git a/src/geophires_x/SurfacePlantHeatPump.py b/src/geophires_x/SurfacePlantHeatPump.py index 34f72e1c..35741df8 100644 --- a/src/geophires_x/SurfacePlantHeatPump.py +++ b/src/geophires_x/SurfacePlantHeatPump.py @@ -131,4 +131,5 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) - model.logger.info("complete " + str(__class__) + ": " + inspect.currentframe().f_code.co_name) + self._calculate_derived_outputs(model) + model.logger.info(f"complete {str(__class__)}: {inspect.currentframe().f_code.co_name}") diff --git a/src/geophires_x/SurfacePlantIndustrialHeat.py b/src/geophires_x/SurfacePlantIndustrialHeat.py index 5059f26c..d8a12a9e 100644 --- a/src/geophires_x/SurfacePlantIndustrialHeat.py +++ b/src/geophires_x/SurfacePlantIndustrialHeat.py @@ -98,4 +98,5 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) - model.logger.info("complete " + self.__class__.__name__ + ": " + __name__) + self._calculate_derived_outputs(model) + model.logger.info(f"complete {self.__class__.__name__}: {__name__}") diff --git a/src/geophires_x/SurfacePlantSUTRA.py b/src/geophires_x/SurfacePlantSUTRA.py index a985091a..441e2a6d 100644 --- a/src/geophires_x/SurfacePlantSUTRA.py +++ b/src/geophires_x/SurfacePlantSUTRA.py @@ -204,5 +204,6 @@ def Calculate(self, model: Model) -> None: # calculate maximum auxiliary boiler demand self.max_peaking_boiler_demand.value = max(self.AnnualAuxiliaryHeatProduced.value) + self._calculate_derived_outputs(model) model.logger.info(f"complete {self.__class__.__name__}: {self.__init__.__name__}") diff --git a/src/geophires_x/SurfacePlantSingleFlash.py b/src/geophires_x/SurfacePlantSingleFlash.py index a5c45dc1..497b0d89 100644 --- a/src/geophires_x/SurfacePlantSingleFlash.py +++ b/src/geophires_x/SurfacePlantSingleFlash.py @@ -133,4 +133,5 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) - model.logger.info("complete " + str(__class__) + ": " + sys._getframe().f_code.co_name) + self._calculate_derived_outputs(model) + model.logger.info(f"complete {str(__class__)}: {sys._getframe().f_code.co_name}") diff --git a/src/geophires_x/SurfacePlantSubcriticalORC.py b/src/geophires_x/SurfacePlantSubcriticalORC.py index 3ce80f50..f1c481a8 100644 --- a/src/geophires_x/SurfacePlantSubcriticalORC.py +++ b/src/geophires_x/SurfacePlantSubcriticalORC.py @@ -131,4 +131,5 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) - model.logger.info("complete " + self.__class__.__name__ + ": " + __name__) + self._calculate_derived_outputs(model) + model.logger.info(f"complete {self.__class__.__name__}: {__name__}") diff --git a/src/geophires_x/SurfacePlantSupercriticalORC.py b/src/geophires_x/SurfacePlantSupercriticalORC.py index 8a115521..e418165d 100644 --- a/src/geophires_x/SurfacePlantSupercriticalORC.py +++ b/src/geophires_x/SurfacePlantSupercriticalORC.py @@ -130,4 +130,5 @@ def Calculate(self, model: Model) -> None: self.RemainingReservoirHeatContent.value = SurfacePlant.remaining_reservoir_heat_content( self, model.reserv.InitialReservoirHeatContent.value, self.HeatkWhExtracted.value) - model.logger.info("complete " + self.__class__.__name__ + ": " + __name__) + self._calculate_derived_outputs(model) + model.logger.info(f"complete {self.__class__.__name__}: {__name__}") diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py index b85863ae..9b547f9e 100644 --- a/src/geophires_x_client/geophires_x_result.py +++ b/src/geophires_x_client/geophires_x_result.py @@ -278,7 +278,7 @@ class GeophiresXResult: 'Average Peaking Boiler Heat Production', 'Minimum Peaking Boiler Heat Production', 'Initial pumping power/net installed power', - 'First Law Efficiency', + 'Heat to Power Conversion Efficiency', # AGS/CLGS 'Surface Plant Cost', # SUTRA From 9463699d5517d80b9b20af5ca2f7527f3752344b Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 10:51:00 -0800 Subject: [PATCH 14/19] Update test cases with 'Heat to Power Conversion Efficiency' output name --- tests/example1_addons.csv | 1 + tests/examples/Fervo_Norbeck_Latimer_2023.out | 8 ++++---- tests/examples/Fervo_Project_Cape-2.out | 8 ++++---- tests/examples/Fervo_Project_Cape-3.out | 8 ++++---- tests/examples/Fervo_Project_Cape.out | 8 ++++---- tests/examples/S-DAC-GT.out | 8 ++++---- ..._Yuan_Closed-Loop_Geothermal_Energy_Recovery.out | 8 ++++---- tests/examples/example1.out | 8 ++++---- tests/examples/example10_HP.out | 13 +++++++------ tests/examples/example11_AC.out | 13 +++++++------ tests/examples/example12_DH.out | 13 +++++++------ tests/examples/example13.out | 8 ++++---- tests/examples/example1_addons.out | 8 ++++---- tests/examples/example1_outputunits.out | 8 ++++---- tests/examples/example2.out | 13 +++++++------ tests/examples/example3.out | 8 ++++---- tests/examples/example4.out | 8 ++++---- tests/examples/example5.out | 13 +++++++------ tests/examples/example8.out | 13 +++++++------ tests/examples/example9.out | 8 ++++---- tests/examples/example_ITC.out | 8 ++++---- tests/examples/example_PTC.out | 8 ++++---- tests/examples/example_SBT_Hi_T.out | 8 ++++---- tests/examples/example_SBT_Lo_T.out | 8 ++++---- tests/examples/example_SHR-1.out | 8 ++++---- tests/examples/example_SHR-2.out | 8 ++++---- tests/examples/example_multiple_gradients-2.out | 8 ++++---- tests/examples/example_multiple_gradients.out | 8 ++++---- tests/examples/example_overpressure.out | 8 ++++---- tests/examples/example_overpressure2.out | 8 ++++---- 30 files changed, 135 insertions(+), 128 deletions(-) diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv index fa1577fc..9eb38097 100644 --- a/tests/example1_addons.csv +++ b/tests/example1_addons.csv @@ -98,6 +98,7 @@ SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Total Electricity Generation SURFACE EQUIPMENT SIMULATION RESULTS,Average Annual Net Electricity Generation,,42.3,GWh SURFACE EQUIPMENT SIMULATION RESULTS,Average Pumping Power,,0.2,MW SURFACE EQUIPMENT SIMULATION RESULTS,Initial pumping power/net installed power,,3.82,% +SURFACE EQUIPMENT SIMULATION RESULTS,Heat to Power Conversion Efficiency,,10.07,% Simulation Metadata,GEOPHIRES Version,,3.7.1, POWER GENERATION PROFILE,THERMAL DRAWDOWN,1,1.0, POWER GENERATION PROFILE,THERMAL DRAWDOWN,2,1.0056, diff --git a/tests/examples/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out index c22b75a1..3f660769 100644 --- a/tests/examples/Fervo_Norbeck_Latimer_2023.out +++ b/tests/examples/Fervo_Norbeck_Latimer_2023.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.471 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.443 sec ***SUMMARY OF RESULTS*** @@ -129,7 +129,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 17.70 GWh Initial pumping power/net installed power: 28.16 % Average Pumping Power: 0.63 MW - Heat to power conversion efficiency: 9.95 % + Heat to Power Conversion Efficiency: 9.95 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape-2.out b/tests/examples/Fervo_Project_Cape-2.out index 70d9a521..f08e99ae 100644 --- a/tests/examples/Fervo_Project_Cape-2.out +++ b/tests/examples/Fervo_Project_Cape-2.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.689 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.684 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 69.67 GWh Initial pumping power/net installed power: 1.68 % Average Pumping Power: 0.15 MW - Heat to power conversion efficiency: 16.00 % + Heat to Power Conversion Efficiency: 16.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape-3.out b/tests/examples/Fervo_Project_Cape-3.out index 65f9a0d3..5a94acb3 100644 --- a/tests/examples/Fervo_Project_Cape-3.out +++ b/tests/examples/Fervo_Project_Cape-3.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.910 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.889 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 3171.75 GWh Initial pumping power/net installed power: 13.50 % Average Pumping Power: 53.73 MW - Heat to power conversion efficiency: 14.39 % + Heat to Power Conversion Efficiency: 14.39 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Fervo_Project_Cape.out b/tests/examples/Fervo_Project_Cape.out index f91b3477..ad4650e9 100644 --- a/tests/examples/Fervo_Project_Cape.out +++ b/tests/examples/Fervo_Project_Cape.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.698 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.672 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 693.77 GWh Initial pumping power/net installed power: 19.31 % Average Pumping Power: 17.82 MW - Heat to power conversion efficiency: 13.05 % + Heat to Power Conversion Efficiency: 13.05 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out index 89acee65..49944183 100644 --- a/tests/examples/S-DAC-GT.out +++ b/tests/examples/S-DAC-GT.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.104 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.107 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Initial Net Heat Production: 14.05 MW Average Annual Heat Production: -4.73 GWh Average Pumping Power: 0.19 MW - Heat to power conversion efficiency: 16.55 % + Heat to Power Conversion Efficiency: 16.55 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out index 9a3161e1..71da797a 100644 --- a/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out +++ b/tests/examples/Wanju_Yuan_Closed-Loop_Geothermal_Energy_Recovery.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 1.663 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 1.658 sec ***SUMMARY OF RESULTS*** @@ -109,7 +109,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Net Electricity Generation: 8.63 GWh Initial pumping power/net installed power: 0.13 % Average Pumping Power: 0.00 MW - Heat to power conversion efficiency: 5.16 % + Heat to Power Conversion Efficiency: 5.16 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1.out b/tests/examples/example1.out index f372e642..f22f32db 100644 --- a/tests/examples/example1.out +++ b/tests/examples/example1.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.838 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.829 sec ***SUMMARY OF RESULTS*** @@ -126,7 +126,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.28 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW - Heat to power conversion efficiency: 10.07 % + Heat to Power Conversion Efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out index cf5e652e..325dae9f 100644 --- a/tests/examples/example10_HP.out +++ b/tests/examples/example10_HP.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.7 - Simulation Date: 2025-01-14 - Simulation Time: 08:40 - Calculation Time: 0.104 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.109 sec ***SUMMARY OF RESULTS*** @@ -18,7 +18,7 @@ Simulation Metadata Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 70.0 kg/sec - Well depth: 2.1 kilometer + Well depth: 2.1 kilometer Geothermal gradient: 45 degC/km @@ -39,7 +39,7 @@ Simulation Metadata Number of Production Wells: 2 Number of Injection Wells: 2 - Well depth: 2.1 kilometer + Well depth: 2.1 kilometer Water loss rate: 2.0 Pump efficiency: 80.0 % Injection temperature: 83.0 degC @@ -121,6 +121,7 @@ Simulation Metadata Average Annual Heat Production: 132.75 GWh Average Annual Heat Pump Electricity Use: 52.68 GWh/year Average Pumping Power: 0.45 MW + Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out index 4969ad6c..786fc95c 100644 --- a/tests/examples/example11_AC.out +++ b/tests/examples/example11_AC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.7 - Simulation Date: 2025-01-14 - Simulation Time: 08:40 - Calculation Time: 0.103 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.101 sec ***SUMMARY OF RESULTS*** @@ -19,7 +19,7 @@ Simulation Metadata Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 50.0 kg/sec - Well depth: 2.1 kilometer + Well depth: 2.1 kilometer Geothermal gradient: 45 degC/km @@ -40,7 +40,7 @@ Simulation Metadata Number of Production Wells: 2 Number of Injection Wells: 2 - Well depth: 2.1 kilometer + Well depth: 2.1 kilometer Water loss rate: 2.0 Pump efficiency: 80.0 % Injection temperature: 83.0 degC @@ -126,6 +126,7 @@ Simulation Metadata Initial Cooling Production: 5.80 MW Average Annual Cooling Production: 43.89 GWh/year Average Pumping Power: 0.20 MW + Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out index dd752b19..d9f37242 100644 --- a/tests/examples/example12_DH.out +++ b/tests/examples/example12_DH.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.7 - Simulation Date: 2025-01-14 - Simulation Time: 08:40 - Calculation Time: 0.581 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.615 sec ***SUMMARY OF RESULTS*** @@ -21,7 +21,7 @@ Simulation Metadata Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 50.0 kg/sec - Well depth: 3.5 kilometer + Well depth: 3.5 kilometer Geothermal gradient: 23.4 degC/km @@ -42,7 +42,7 @@ Simulation Metadata Number of Production Wells: 2 Number of Injection Wells: 2 - Well depth: 3.5 kilometer + Well depth: 3.5 kilometer Water loss rate: 0.0 Pump efficiency: 80.0 % Injection temperature: 50.0 degC @@ -137,6 +137,7 @@ Simulation Metadata Average Peaking Boiler Heat Production: 15.27 MW Minimum Peaking Boiler Heat Production: 0.00 MW Average Pumping Power: 0.44 MW + Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example13.out b/tests/examples/example13.out index 7ac87494..6bf27ffa 100644 --- a/tests/examples/example13.out +++ b/tests/examples/example13.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.037 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.035 sec ***SUMMARY OF RESULTS*** @@ -132,7 +132,7 @@ Simulation Metadata Initial Net Heat Production: 19.63 MW Average Annual Heat Production: 108.31 GWh Average Pumping Power: 0.25 MW - Heat to power conversion efficiency: 7.58 % + Heat to Power Conversion Efficiency: 7.58 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1_addons.out b/tests/examples/example1_addons.out index b8ea6001..f7402445 100644 --- a/tests/examples/example1_addons.out +++ b/tests/examples/example1_addons.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.818 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.779 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.30 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW - Heat to power conversion efficiency: 10.07 % + Heat to Power Conversion Efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example1_outputunits.out b/tests/examples/example1_outputunits.out index 6d42ab5e..23469bd7 100644 --- a/tests/examples/example1_outputunits.out +++ b/tests/examples/example1_outputunits.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.836 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.778 sec ***SUMMARY OF RESULTS*** @@ -126,7 +126,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 42.28 GWh Initial pumping power/net installed power: 3.82 % Average Pumping Power: 0.20 MW - Heat to power conversion efficiency: 10.07 % + Heat to Power Conversion Efficiency: 10.07 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example2.out b/tests/examples/example2.out index ac59c9ec..bb49c60a 100644 --- a/tests/examples/example2.out +++ b/tests/examples/example2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.7 - Simulation Date: 2025-01-14 - Simulation Time: 08:40 - Calculation Time: 0.218 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.214 sec ***SUMMARY OF RESULTS*** @@ -17,7 +17,7 @@ Simulation Metadata Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 30.0 kg/sec - Well depth: 3.0 kilometer + Well depth: 3.0 kilometer Geothermal gradient: 55 degC/km @@ -38,7 +38,7 @@ Simulation Metadata Number of Production Wells: 2 Number of Injection Wells: 2 - Well depth: 3.0 kilometer + Well depth: 3.0 kilometer Water loss rate: 0.0 Pump efficiency: 80.0 % Injection temperature: 70.0 degC @@ -120,6 +120,7 @@ Simulation Metadata Initial Net Heat Production: 22.52 MW Average Annual Heat Production: 167.12 GWh Average Pumping Power: 0.80 MW + Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example3.out b/tests/examples/example3.out index 2558e2c9..fe25911a 100644 --- a/tests/examples/example3.out +++ b/tests/examples/example3.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.123 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.117 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Initial Net Heat Production: 11.67 MW Average Annual Heat Production: 84.33 GWh Average Pumping Power: 0.20 MW - Heat to power conversion efficiency: 16.50 % + Heat to Power Conversion Efficiency: 16.50 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example4.out b/tests/examples/example4.out index 5888287b..16b7924e 100644 --- a/tests/examples/example4.out +++ b/tests/examples/example4.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.054 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.049 sec ***SUMMARY OF RESULTS*** @@ -124,7 +124,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 54.69 GWh Initial pumping power/net installed power: 15.60 % Average Pumping Power: 1.31 MW - Heat to power conversion efficiency: 7.30 % + Heat to Power Conversion Efficiency: 7.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example5.out b/tests/examples/example5.out index 65b8632a..64d6b790 100644 --- a/tests/examples/example5.out +++ b/tests/examples/example5.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.7 - Simulation Date: 2025-01-14 - Simulation Time: 08:40 - Calculation Time: 0.050 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.051 sec ***SUMMARY OF RESULTS*** @@ -17,7 +17,7 @@ Simulation Metadata Number of production wells: 2 Number of injection wells: 2 Flowrate per production well: 50.0 kg/sec - Well depth: 3.0 kilometer + Well depth: 3.0 kilometer Geothermal gradient: 45 degC/km @@ -37,7 +37,7 @@ Simulation Metadata Number of Production Wells: 2 Number of Injection Wells: 2 - Well depth: 3.0 kilometer + Well depth: 3.0 kilometer Water loss rate: 2.0 Pump efficiency: 80.0 % Injection temperature: 80.0 degC @@ -116,6 +116,7 @@ Simulation Metadata Initial Net Heat Production: 24.29 MW Average Annual Heat Production: 153.95 GWh Average Pumping Power: 0.55 MW + Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example8.out b/tests/examples/example8.out index 067fef74..ee287c36 100644 --- a/tests/examples/example8.out +++ b/tests/examples/example8.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.6.7 - Simulation Date: 2025-01-14 - Simulation Time: 08:40 - Calculation Time: 0.805 sec + GEOPHIRES Version: 3.7.1 + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.791 sec ***SUMMARY OF RESULTS*** @@ -17,7 +17,7 @@ Simulation Metadata Number of production wells: 1 Number of injection wells: 1 Flowrate per production well: 40.0 kg/sec - Well depth: 2.8 kilometer + Well depth: 2.8 kilometer Geothermal gradient: 28 degC/km @@ -38,7 +38,7 @@ Simulation Metadata Number of Production Wells: 1 Number of Injection Wells: 1 - Well depth: 2.8 kilometer + Well depth: 2.8 kilometer Water loss rate: 2.0 Pump efficiency: 80.0 % Injection temperature: 30.0 degC @@ -120,6 +120,7 @@ Simulation Metadata Initial Net Heat Production: 9.67 MW Average Annual Heat Production: 50.20 GWh Average Pumping Power: 0.09 MW + Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example9.out b/tests/examples/example9.out index c2346fa2..d7b8c3ed 100644 --- a/tests/examples/example9.out +++ b/tests/examples/example9.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.835 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.796 sec ***SUMMARY OF RESULTS*** @@ -128,7 +128,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 3.67 GWh Initial pumping power/net installed power: 16.55 % Average Pumping Power: 0.08 MW - Heat to power conversion efficiency: 4.64 % + Heat to Power Conversion Efficiency: 4.64 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out index 4e0e707d..5a99f1a1 100644 --- a/tests/examples/example_ITC.out +++ b/tests/examples/example_ITC.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.822 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.812 sec ***SUMMARY OF RESULTS*** @@ -125,7 +125,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 147.70 GWh Initial pumping power/net installed power: 3.56 % Average Pumping Power: 0.64 MW - Heat to power conversion efficiency: 17.30 % + Heat to Power Conversion Efficiency: 17.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out index 25dcd884..325f2fe8 100644 --- a/tests/examples/example_PTC.out +++ b/tests/examples/example_PTC.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.833 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.772 sec ***SUMMARY OF RESULTS*** @@ -124,7 +124,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 147.70 GWh Initial pumping power/net installed power: 3.56 % Average Pumping Power: 0.64 MW - Heat to power conversion efficiency: 17.30 % + Heat to Power Conversion Efficiency: 17.30 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SBT_Hi_T.out b/tests/examples/example_SBT_Hi_T.out index 112bb098..bab06b21 100644 --- a/tests/examples/example_SBT_Hi_T.out +++ b/tests/examples/example_SBT_Hi_T.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 35.137 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 9.906 sec ***SUMMARY OF RESULTS*** @@ -108,7 +108,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Total Electricity Generation: 75.03 GWh Average Annual Net Electricity Generation: 75.03 GWh Average Pumping Power: 0.00 MW - Heat to power conversion efficiency: 17.15 % + Heat to Power Conversion Efficiency: 17.15 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SBT_Lo_T.out b/tests/examples/example_SBT_Lo_T.out index c967dd68..9dc050a5 100644 --- a/tests/examples/example_SBT_Lo_T.out +++ b/tests/examples/example_SBT_Lo_T.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 15.861 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 1.508 sec ***SUMMARY OF RESULTS*** @@ -108,7 +108,7 @@ The AGS models contain an intrinsic reservoir model that doesn't expose values t Average Annual Total Electricity Generation: 0.02 GWh Average Annual Net Electricity Generation: 0.02 GWh Average Pumping Power: 0.00 MW - Heat to power conversion efficiency: 0.27 % + Heat to Power Conversion Efficiency: 0.27 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out index 6e9d377b..9c9c32f7 100644 --- a/tests/examples/example_SHR-1.out +++ b/tests/examples/example_SHR-1.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.855 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.810 sec ***SUMMARY OF RESULTS*** @@ -123,7 +123,7 @@ Simulation Metadata Average Annual Total Electricity Generation: 241.59 GWh Average Annual Net Electricity Generation: 241.59 GWh Average Pumping Power: 0.00 MW - Heat to power conversion efficiency: 20.28 % + Heat to Power Conversion Efficiency: 20.28 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out index 64b178c2..c6557dab 100644 --- a/tests/examples/example_SHR-2.out +++ b/tests/examples/example_SHR-2.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.550 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.543 sec ***SUMMARY OF RESULTS*** @@ -123,7 +123,7 @@ Simulation Metadata Average Annual Total Electricity Generation: 856.31 GWh Average Annual Net Electricity Generation: 856.31 GWh Average Pumping Power: 0.00 MW - Heat to power conversion efficiency: 35.83 % + Heat to Power Conversion Efficiency: 35.83 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_multiple_gradients-2.out b/tests/examples/example_multiple_gradients-2.out index 4bafe464..09b2eb29 100644 --- a/tests/examples/example_multiple_gradients-2.out +++ b/tests/examples/example_multiple_gradients-2.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.851 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.797 sec ***SUMMARY OF RESULTS*** @@ -137,7 +137,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 62.72 GWh Initial pumping power/net installed power: 2.05 % Average Pumping Power: 0.19 MW - Heat to power conversion efficiency: 11.89 % + Heat to Power Conversion Efficiency: 11.89 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out index 4060353e..575fed0b 100644 --- a/tests/examples/example_multiple_gradients.out +++ b/tests/examples/example_multiple_gradients.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:14 - Calculation Time: 0.819 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:48 + Calculation Time: 0.831 sec ***SUMMARY OF RESULTS*** @@ -137,7 +137,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 62.72 GWh Initial pumping power/net installed power: 2.05 % Average Pumping Power: 0.19 MW - Heat to power conversion efficiency: 11.89 % + Heat to Power Conversion Efficiency: 11.89 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out index 3aa78577..8931f95d 100644 --- a/tests/examples/example_overpressure.out +++ b/tests/examples/example_overpressure.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.845 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.901 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 40.92 GWh Initial pumping power/net installed power: 3.71 % Average Pumping Power: 0.87 MW - Heat to power conversion efficiency: 8.26 % + Heat to Power Conversion Efficiency: 8.26 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out index 789895a7..6159684b 100644 --- a/tests/examples/example_overpressure2.out +++ b/tests/examples/example_overpressure2.out @@ -5,9 +5,9 @@ Simulation Metadata ---------------------- GEOPHIRES Version: 3.7.1 - Simulation Date: 2025-01-21 - Simulation Time: 14:13 - Calculation Time: 0.830 sec + Simulation Date: 2025-01-22 + Simulation Time: 10:47 + Calculation Time: 0.950 sec ***SUMMARY OF RESULTS*** @@ -127,7 +127,7 @@ Simulation Metadata Average Annual Net Electricity Generation: 41.88 GWh Initial pumping power/net installed power: 3.71 % Average Pumping Power: 0.75 MW - Heat to power conversion efficiency: 8.45 % + Heat to Power Conversion Efficiency: 8.45 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * From 70e0f61e1155ecb69710f37a1e51dd6442e46939 Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 10:52:01 -0800 Subject: [PATCH 15/19] =?UTF-8?q?Bump=20version:=203.7.1=20=E2=86=92=203.7?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 6b5545f4..4dd1dfcf 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.1 +current_version = 3.7.2 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index ba802b44..6aeebead 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.7.1 + version: 3.7.2 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index a267bed3..8c308e87 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.1.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.2.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.1...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.2...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 1fb750a0..0423a0ec 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2024' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.1' +version = release = '3.7.2' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index da6964ef..d237a4d1 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.1', + version='3.7.2', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 380cd80a..368b1f26 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.1' +__version__ = '3.7.2' From 5aa60a719dafe9e5dc8d172d8dbdebf11cbb52ad Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:03:50 -0800 Subject: [PATCH 16/19] Don't output efficiency when not applicable --- src/geophires_x/Parameter.py | 2 +- src/geophires_x/SurfacePlant.py | 1 + tests/examples/example10_HP.out | 7 +++---- tests/examples/example11_AC.out | 7 +++---- tests/examples/example12_DH.out | 7 +++---- tests/examples/example2.out | 7 +++---- tests/examples/example5.out | 7 +++---- tests/examples/example8.out | 7 +++---- 8 files changed, 20 insertions(+), 25 deletions(-) diff --git a/src/geophires_x/Parameter.py b/src/geophires_x/Parameter.py index 8faa4c20..086f2f42 100644 --- a/src/geophires_x/Parameter.py +++ b/src/geophires_x/Parameter.py @@ -63,7 +63,7 @@ class OutputParameter(HasQuantity): """ Name: str = "" - value: int = 0 + value: Any = 0 ToolTipText: str = "" UnitType: IntEnum = Units.NONE PreferredUnits: Enum = Units.NONE diff --git a/src/geophires_x/SurfacePlant.py b/src/geophires_x/SurfacePlant.py index 22eb5a2a..0d1914a7 100644 --- a/src/geophires_x/SurfacePlant.py +++ b/src/geophires_x/SurfacePlant.py @@ -491,6 +491,7 @@ def __init__(self, model: Model): ) self.heat_to_power_conversion_efficiency = self.OutputParameterDict[self.heat_to_power_conversion_efficiency.Name] = OutputParameter( Name='Heat to Power Conversion Efficiency', + value=None, UnitType=Units.PERCENT, PreferredUnits=PercentUnit.PERCENT, CurrentUnits=PercentUnit.PERCENT, diff --git a/tests/examples/example10_HP.out b/tests/examples/example10_HP.out index 325dae9f..92ca0895 100644 --- a/tests/examples/example10_HP.out +++ b/tests/examples/example10_HP.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 + GEOPHIRES Version: 3.7.2 Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.109 sec + Simulation Time: 11:01 + Calculation Time: 0.101 sec ***SUMMARY OF RESULTS*** @@ -121,7 +121,6 @@ Simulation Metadata Average Annual Heat Production: 132.75 GWh Average Annual Heat Pump Electricity Use: 52.68 GWh/year Average Pumping Power: 0.45 MW - Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example11_AC.out b/tests/examples/example11_AC.out index 786fc95c..1042b14f 100644 --- a/tests/examples/example11_AC.out +++ b/tests/examples/example11_AC.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 + GEOPHIRES Version: 3.7.2 Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.101 sec + Simulation Time: 11:01 + Calculation Time: 0.099 sec ***SUMMARY OF RESULTS*** @@ -126,7 +126,6 @@ Simulation Metadata Initial Cooling Production: 5.80 MW Average Annual Cooling Production: 43.89 GWh/year Average Pumping Power: 0.20 MW - Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example12_DH.out b/tests/examples/example12_DH.out index d9f37242..20888def 100644 --- a/tests/examples/example12_DH.out +++ b/tests/examples/example12_DH.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 + GEOPHIRES Version: 3.7.2 Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.615 sec + Simulation Time: 11:01 + Calculation Time: 0.567 sec ***SUMMARY OF RESULTS*** @@ -137,7 +137,6 @@ Simulation Metadata Average Peaking Boiler Heat Production: 15.27 MW Minimum Peaking Boiler Heat Production: 0.00 MW Average Pumping Power: 0.44 MW - Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example2.out b/tests/examples/example2.out index bb49c60a..1621bb3b 100644 --- a/tests/examples/example2.out +++ b/tests/examples/example2.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 + GEOPHIRES Version: 3.7.2 Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.214 sec + Simulation Time: 11:01 + Calculation Time: 0.208 sec ***SUMMARY OF RESULTS*** @@ -120,7 +120,6 @@ Simulation Metadata Initial Net Heat Production: 22.52 MW Average Annual Heat Production: 167.12 GWh Average Pumping Power: 0.80 MW - Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example5.out b/tests/examples/example5.out index 64d6b790..8b8d0bf7 100644 --- a/tests/examples/example5.out +++ b/tests/examples/example5.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 + GEOPHIRES Version: 3.7.2 Simulation Date: 2025-01-22 - Simulation Time: 10:47 - Calculation Time: 0.051 sec + Simulation Time: 11:01 + Calculation Time: 0.047 sec ***SUMMARY OF RESULTS*** @@ -116,7 +116,6 @@ Simulation Metadata Initial Net Heat Production: 24.29 MW Average Annual Heat Production: 153.95 GWh Average Pumping Power: 0.55 MW - Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * diff --git a/tests/examples/example8.out b/tests/examples/example8.out index ee287c36..719c8954 100644 --- a/tests/examples/example8.out +++ b/tests/examples/example8.out @@ -4,10 +4,10 @@ Simulation Metadata ---------------------- - GEOPHIRES Version: 3.7.1 + GEOPHIRES Version: 3.7.2 Simulation Date: 2025-01-22 - Simulation Time: 10:48 - Calculation Time: 0.791 sec + Simulation Time: 11:01 + Calculation Time: 0.772 sec ***SUMMARY OF RESULTS*** @@ -120,7 +120,6 @@ Simulation Metadata Initial Net Heat Production: 9.67 MW Average Annual Heat Production: 50.20 GWh Average Pumping Power: 0.09 MW - Heat to Power Conversion Efficiency: 0.00 % ************************************************************ * HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE * From da5d42df03cdced3f2ffc4a08f29bf7ad2f63d6a Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:14:32 -0800 Subject: [PATCH 17/19] Convert efficiency into its CurrentUnits instead of hardcoding tenth to percent multiplication --- src/geophires_x/Outputs.py | 1 - src/geophires_x/SurfacePlant.py | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/geophires_x/Outputs.py b/src/geophires_x/Outputs.py index 4064951c..1a5ce3af 100644 --- a/src/geophires_x/Outputs.py +++ b/src/geophires_x/Outputs.py @@ -23,7 +23,6 @@ PlantType from geophires_x.GeoPHIRESUtils import UpgradeSymbologyOfUnits, render_default, InsertImagesIntoHTML from geophires_x.Parameter import Parameter -from geophires_x.Units import convertible_unit, Units, PercentUnit NL = '\n' validFilenameChars = "-_.() %s%s" % (string.ascii_letters, string.digits) diff --git a/src/geophires_x/SurfacePlant.py b/src/geophires_x/SurfacePlant.py index 0d1914a7..149bd0d7 100644 --- a/src/geophires_x/SurfacePlant.py +++ b/src/geophires_x/SurfacePlant.py @@ -2,6 +2,7 @@ import os import numpy as np +from .GeoPHIRESUtils import quantity from .OptionList import EndUseOptions, PlantType from .Parameter import floatParameter, intParameter, strParameter, OutputParameter, ReadParameter, \ coerce_int_params_to_enum_values @@ -486,7 +487,7 @@ def __init__(self, model: Model): Name="First Law Efficiency", UnitType=Units.PERCENT, PreferredUnits=PercentUnit.PERCENT, - CurrentUnits=PercentUnit.PERCENT, + CurrentUnits=PercentUnit.PERCENT, # FIXME default values are actually in tenths, not percent. ToolTipText='Net electricity produced divided by heat extracted towards electricity' ) self.heat_to_power_conversion_efficiency = self.OutputParameterDict[self.heat_to_power_conversion_efficiency.Name] = OutputParameter( @@ -657,6 +658,8 @@ def _calculate_derived_outputs(self, model: Model) -> None: """ if self.FirstLawEfficiency is not None: - avg_efficiency = np.average(model.surfaceplant.FirstLawEfficiency.value) * 100 # TODO proper unit conversion + fle_unit = PercentUnit.TENTH # See FIXME on self.FirstLawEfficiency re: CurrentUnit being incorrect. + avg_efficiency = quantity(np.average(model.surfaceplant.FirstLawEfficiency.value), fle_unit).to( + convertible_unit(self.heat_to_power_conversion_efficiency.CurrentUnits)).magnitude if avg_efficiency > 0: # 0 is presumed to mean N/A self.heat_to_power_conversion_efficiency.value = avg_efficiency From e6a084462de52a6db9d1b3e1b0702846213079bb Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:26:13 -0800 Subject: [PATCH 18/19] =?UTF-8?q?Bump=20version:=203.7.2=20=E2=86=92=203.7?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- .cookiecutterrc | 2 +- README.rst | 4 ++-- docs/conf.py | 2 +- setup.py | 2 +- src/geophires_x/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 4dd1dfcf..abe21e9a 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 3.7.2 +current_version = 3.7.3 commit = True tag = True diff --git a/.cookiecutterrc b/.cookiecutterrc index 6aeebead..8d23c40b 100644 --- a/.cookiecutterrc +++ b/.cookiecutterrc @@ -54,7 +54,7 @@ default_context: sphinx_doctest: "no" sphinx_theme: "sphinx-py3doc-enhanced-theme" test_matrix_separate_coverage: "no" - version: 3.7.2 + version: 3.7.3 version_manager: "bump2version" website: "https://github.com/NREL" year_from: "2023" diff --git a/README.rst b/README.rst index 8c308e87..16b643f5 100644 --- a/README.rst +++ b/README.rst @@ -56,9 +56,9 @@ Free software: `MIT license `__ :alt: Supported implementations :target: https://pypi.org/project/geophires-x -.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.2.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/softwareengineerprogrammer/GEOPHIRES-X/v3.7.3.svg :alt: Commits since latest release - :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.2...main + :target: https://github.com/softwareengineerprogrammer/GEOPHIRES-X/compare/v3.7.3...main .. |docs| image:: https://readthedocs.org/projects/GEOPHIRES-X/badge/?style=flat :target: https://nrel.github.io/GEOPHIRES-X diff --git a/docs/conf.py b/docs/conf.py index 0423a0ec..006089bf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -18,7 +18,7 @@ year = '2024' author = 'NREL' copyright = f'{year}, {author}' -version = release = '3.7.2' +version = release = '3.7.3' pygments_style = 'trac' templates_path = ['./templates'] diff --git a/setup.py b/setup.py index d237a4d1..a6e3821b 100755 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ def read(*names, **kwargs): setup( name='geophires-x', - version='3.7.2', + version='3.7.3', license='MIT', description='GEOPHIRES is a free and open-source geothermal techno-economic simulator.', long_description='{}\n{}'.format( diff --git a/src/geophires_x/__init__.py b/src/geophires_x/__init__.py index 368b1f26..87c08592 100644 --- a/src/geophires_x/__init__.py +++ b/src/geophires_x/__init__.py @@ -1 +1 @@ -__version__ = '3.7.2' +__version__ = '3.7.3' From 528c3f1db8650a151f981933f85129e8319bff4c Mon Sep 17 00:00:00 2001 From: softwareengineerprogrammer <4056124+softwareengineerprogrammer@users.noreply.github.com> Date: Wed, 22 Jan 2025 11:28:21 -0800 Subject: [PATCH 19/19] 3.7.3 changelog entry --- CHANGELOG.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index f0c3b4e6..418a4002 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -12,6 +12,8 @@ GEOPHIRES-X (2023-2025) "Well depth (or total length, if not vertical)" output field renamed to "Well depth" per https://github.com/NREL/GEOPHIRES-X/issues/321 +3.7.3: Heat to Power Conversion Efficiency output added. + 3.6 ^^^