Update tests for addition of first law efficiency output

softwareengineerprogrammer · softwareengineerprogrammer · commit 10f22a919ead · 2025-01-17T11:27:54.000-08:00
diff --git a/tests/example1_addons.csv b/tests/example1_addons.csv
@@ -97,8 +97,9 @@ 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.6.3,
+Simulation Metadata,GEOPHIRES Version,,3.6.9,
 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/Fervo_Norbeck_Latimer_2023.out b/tests/examples/Fervo_Norbeck_Latimer_2023.out
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.7
- Simulation Date: 2025-01-14
- Simulation Time:  07:37
- Calculation Time:      0.438 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.461 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-18
- Simulation Time:  16:56
- Calculation Time:      2.730 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.690 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.4
- Simulation Date: 2024-11-18
- Simulation Time:  19:49
- Calculation Time:      3.484 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.919 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-18
- Simulation Time:  16:54
- Calculation Time:      3.061 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.689 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:20
- Calculation Time:      0.406 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.106 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.7
- Simulation Date: 2025-01-14
- Simulation Time:  07:37
- Calculation Time:      1.613 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      1.655 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  14:48
- Calculation Time:      3.450 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:23
+ Calculation Time:      0.923 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:07
- Calculation Time:      0.143 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:23
+ Calculation Time:      0.037 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:09
- Calculation Time:      3.281 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:23
+ Calculation Time:      0.817 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:10
- Calculation Time:      3.381 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:24
+ Calculation Time:      0.818 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:11
- Calculation Time:      0.455 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:24
+ Calculation Time:      0.124 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:12
- Calculation Time:      0.192 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:23
+ 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:13
- Calculation Time:      3.033 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.821 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:14
- Calculation Time:      3.140 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:      0.848 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.3
- Simulation Date: 2024-11-11
- Simulation Time:  15:16
- Calculation Time:      3.056 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:24
+ Calculation Time:      0.824 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
@@ -4,10 +4,10 @@
 
 Simulation Metadata
 ----------------------
- GEOPHIRES Version: 3.6.7
- Simulation Date: 2025-01-14
- Simulation Time:  07:37
- Calculation Time:      8.011 sec
+ GEOPHIRES Version: 3.6.9
+ Simulation Date: 2025-01-17
+ Simulation Time:  11:25
+ Calculation Time:     70.710 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
diff --git a/tests/examples/example_SHR-1.out b/tests/examples/example_SHR-1.out
diff --git a/tests/examples/example_SHR-2.out b/tests/examples/example_SHR-2.out
diff --git a/tests/examples/example_multiple_gradients-2.out b/tests/examples/example_multiple_gradients-2.out
diff --git a/tests/examples/example_multiple_gradients.out b/tests/examples/example_multiple_gradients.out
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
