Don't output efficiency when not applicable

softwareengineerprogrammer · softwareengineerprogrammer · commit 5aa60a719daf · 2025-01-22T11:03:50.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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  *

Original file line number	Diff line number	Diff line change
`@@ -491,6 +491,7 @@ def __init__(self, model: Model):`
`491`	`491`	`)`
`492`	`492`	`self.heat_to_power_conversion_efficiency = self.OutputParameterDict[self.heat_to_power_conversion_efficiency.Name] = OutputParameter(`
`493`	`493`	`Name='Heat to Power Conversion Efficiency',`
	`494`	`+ value=None,`
`494`	`495`	`UnitType=Units.PERCENT,`
`495`	`496`	`PreferredUnits=PercentUnit.PERCENT,`
`496`	`497`	`CurrentUnits=PercentUnit.PERCENT,`