Output first law efficiency after initial pumping power/net installed power

softwareengineerprogrammer · softwareengineerprogrammer · commit c7497cedfa21 · 2025-01-17T12:11:41.000-08:00
diff --git a/src/geophires_x_client/geophires_x_result.py b/src/geophires_x_client/geophires_x_result.py
@@ -276,10 +276,9 @@ 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',
+                'First Law Efficiency',
                 # SUTRA
                 'Average RTES Heating Production',
                 'Average Auxiliary Heating Production',
diff --git 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.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.461 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.459 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git 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.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.690 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.696 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git 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.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.919 sec
+ Simulation Time:  12:10
+ Calculation Time:      0.932 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/Fervo_Project_Cape.out b/tests/examples/Fervo_Project_Cape.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.689 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.703 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/S-DAC-GT.out b/tests/examples/S-DAC-GT.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.106 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.107 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git 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.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      1.655 sec
+ Simulation Time:  12:04
+ Calculation Time:      1.674 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/example1.out b/tests/examples/example1.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:23
- Calculation Time:      0.923 sec
+ Simulation Time:  12:02
+ Calculation Time:      0.828 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 %
+      First Law Efficiency:                                  10.07 %
 
                             ************************************************************
                             *  HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE  *
diff --git a/tests/examples/example13.out b/tests/examples/example13.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:23
- Calculation Time:      0.037 sec
+ Simulation Time:  12:02
+ Calculation Time:      0.039 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 %
+      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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:23
- Calculation Time:      0.817 sec
+ Simulation Time:  12:02
+ Calculation Time:      0.823 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 %
+      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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:24
- Calculation Time:      0.818 sec
+ Simulation Time:  12:02
+ Calculation Time:      0.831 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 %
+      First Law Efficiency:                                  10.07 %
 
                             ************************************************************
                             *  HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE  *
diff --git a/tests/examples/example3.out b/tests/examples/example3.out
@@ -4,9 +4,9 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:24
+ Simulation Time:  12:02
  Calculation Time:      0.124 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 %
+      First Law Efficiency:                                  16.50 %
 
                             ************************************************************
                             *  HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE  *
diff --git a/tests/examples/example4.out b/tests/examples/example4.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:23
- Calculation Time:      0.050 sec
+ Simulation Time:  12:02
+ Calculation Time:      0.057 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 %
+      First Law Efficiency:                                   7.30 %
 
                             ************************************************************
                             *  HEATING, COOLING AND/OR ELECTRICITY PRODUCTION PROFILE  *
diff --git a/tests/examples/example9.out b/tests/examples/example9.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.821 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.825 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/example_ITC.out b/tests/examples/example_ITC.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.848 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.832 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/example_PTC.out b/tests/examples/example_PTC.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:24
- Calculation Time:      0.824 sec
+ Simulation Time:  12:02
+ Calculation Time:      0.841 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 %
+      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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:     70.710 sec
+ Simulation Time:  12:04
+ Calculation Time:     77.626 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 %
+      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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:23
- Calculation Time:     16.190 sec
+ Simulation Time:  12:02
+ Calculation Time:     36.875 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 %
+      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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.856 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.825 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.566 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.550 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git 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.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.821 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.831 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.9
+ GEOPHIRES Version: 3.6.10
  Simulation Date: 2025-01-17
- Simulation Time:  11:25
- Calculation Time:      0.833 sec
+ Simulation Time:  12:04
+ Calculation Time:      0.823 sec
 
                            ***SUMMARY OF RESULTS***
 
diff --git a/tests/examples/example_overpressure.out b/tests/examples/example_overpressure.out
diff --git a/tests/examples/example_overpressure2.out b/tests/examples/example_overpressure2.out
