ecoengine 3.2.3__tar.gz → 3.2.6__tar.gz

{ecoengine-3.2.3 → ecoengine-3.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoengine
-Version: 3.2.3
+Version: 3.2.6
 Requires-Python: >=3.11
 Requires-Dist: numpy<3.0,>=2.4
 Requires-Dist: scipy<2.0,>=1.17

{ecoengine-3.2.3 → ecoengine-3.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ecoengine"
-version = "3.2.3"
+version = "3.2.6"
 requires-python = ">=3.11"
 
 # Ranges are bounded on purpose, and the shared ones are kept in sync with

{ecoengine-3.2.3 → ecoengine-3.2.6}/src/ecoengine/objects/components/heating/PerformanceMap.py

@@ -339,6 +339,8 @@ class PklPerformanceMap(PerformanceMap):
         if self._secondary_hx:
             inlet  += self._hx_increase
             outlet += self._hx_increase
+        if inlet > self._inlet_max:
+            print("Warning: Inlet water temperature simulated exceeds performance map boundaries. Simulation accuracy may be impacted.")
         inlet = min(inlet, self._inlet_max)
         return inlet, outlet
 

{ecoengine-3.2.3 → ecoengine-3.2.6}/src/ecoengine/objects/components/heating/WaterHeater.py

@@ -330,6 +330,14 @@ class WaterHeater:
         controls = self.get_controls_for_hour(hour_of_day)
         if controls is None:
             raise ValueError(f"No Controls configured for hour {hour_of_day}.")
+        
+        # QPL Alignment block : QPL states Upon change of load shift operation, disable all heaters if “on sensor” is warmer than “on temperature”.
+        # To do this in EcosizerEngine, we simply turn off water heaters at the beginning of a mode change
+        previous_hour = 23 if hour_of_day == 0 else hour_of_day - 1
+        if self.control_schedule[hour_of_day] != self.control_schedule[previous_hour]:
+            self.turn_off()
+
+        # control logic
         if self._active:
             if controls.should_turn_off(storage_tank):
                 self.turn_off()

{ecoengine-3.2.3 → ecoengine-3.2.6}/src/ecoengine/objects/dhwsystems/rtp_systems/MP_RTPInSeriesSystem.py

@@ -234,16 +234,8 @@ class MP_RTPInSeriesSystem(MultiPassRTPSystem):
                     control_map      = control_map,
                     drawdown_fract   = self.storage_tank.drawdown_fract,
                 )
-            result = {
-                "min_capacity_kbtuh":      comparison_system._minimum_capacity_kbtuh,
-                "min_storage_storageT_gal": comparison_system._minimum_storage_storageT_gal,
-            }
-            if result["min_capacity_kbtuh"] >= nominal_capacity_kbtuh and result["min_storage_storageT_gal"] >= nominal_storage_gal:
-                # redirect user to base model
-                self.fallback_system = comparison_system
-                return
-            else:
-                raise e
+            self.fallback_system = comparison_system
+            return
 
     # ------------------------------------------------------------------
     # Gas backup sizing helpers

{ecoengine-3.2.3 → ecoengine-3.2.6}/src/ecoengine/objects/dhwsystems/rtp_systems/SP_RTPInParallelSystem.py

@@ -287,23 +287,17 @@ class SP_RTPInParallelSystem(SinglePassRTPSystem):
                     control_map                = control_map,
                     load_shift_fract_total_vol = 1.0,
                 )
-            result = {
-                "min_capacity_kbtuh":      comparison_system._minimum_capacity_kbtuh,
-                "min_storage_storageT_gal": comparison_system._minimum_storage_storageT_gal,
-            }
-            if result["min_capacity_kbtuh"] >= nominal_capacity_kbtuh and result["min_storage_storageT_gal"] >= nominal_storage_gal:
-                # redirect user to base model
-                self.fallback_system = comparison_system
-                return
-            else:
-
-                raise ValueError(
-                    "The primary system is already adequately sized: "
-                    f"outage duration was {sim_run.outage_minutes} min "
-                    f"(threshold {self._MIN_OUTAGE_MIN} min) and max temperature deficit "
-                    f"was {max_deficit_f:.2f} °F (threshold {self._MIN_DEFICIT_F:.1f} °F). "
-                    "No gas backup is required."
-                )
+            
+            self.fallback_system = comparison_system
+            return
+
+            # raise ValueError(
+            #     "The primary system is already adequately sized: "
+            #     f"outage duration was {sim_run.outage_minutes} min "
+            #     f"(threshold {self._MIN_OUTAGE_MIN} min) and max temperature deficit "
+            #     f"was {max_deficit_f:.2f} °F (threshold {self._MIN_DEFICIT_F:.1f} °F). "
+            #     "No gas backup is required."
+            # )
 
         # The amount of storage (supply temp gallons) the gas is able to keep in a worst case scenario
         design_inlet    = self._require_design_inlet_temp(building)

{ecoengine-3.2.3 → ecoengine-3.2.6}/src/ecoengine/objects/dhwsystems/rtp_systems/SP_RTPInSeriesSystem.py

@@ -227,16 +227,9 @@ class SP_RTPInSeriesSystem(SinglePassRTPSystem):
                     control_map                = control_map,
                     load_shift_fract_total_vol = 1.0,
                 )
-            result = {
-                "min_capacity_kbtuh":      comparison_system._minimum_capacity_kbtuh,
-                "min_storage_storageT_gal": comparison_system._minimum_storage_storageT_gal,
-            }
-            if result["min_capacity_kbtuh"] >= nominal_capacity_kbtuh and result["min_storage_storageT_gal"] >= nominal_storage_gal:
-                # redirect user to base model
-                self.fallback_system = comparison_system
-                return
-            else:
-                raise e
+            
+            self.fallback_system = comparison_system
+            return
 
             
 

{ecoengine-3.2.3 → ecoengine-3.2.6}/src/ecoengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecoengine
-Version: 3.2.3
+Version: 3.2.6
 Requires-Python: >=3.11
 Requires-Dist: numpy<3.0,>=2.4
 Requires-Dist: scipy<2.0,>=1.17