ecoengine 3.2.2__tar.gz → 3.2.4__tar.gz

{ecoengine-3.2.2 → ecoengine-3.2.4}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: ecoengine
-Version: 3.2.2
+Version: 3.2.4
 Requires-Python: >=3.11
 Requires-Dist: numpy<3.0,>=2.4
 Requires-Dist: scipy<2.0,>=1.17
-Requires-Dist: plotly<8.0,>=7.0
-Requires-Dist: kaleido>=1.3.0
+Requires-Dist: plotly==4.12.0
+Requires-Dist: kaleido==0.2.1
 Provides-Extra: docs
 Requires-Dist: sphinx>=6; extra == "docs"
 Requires-Dist: furo; extra == "docs"

{ecoengine-3.2.2 → ecoengine-3.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ecoengine"
-version = "3.2.2"
+version = "3.2.4"
 requires-python = ">=3.11"
 
 # Ranges are bounded on purpose, and the shared ones are kept in sync with
@@ -31,8 +31,8 @@ requires-python = ">=3.11"
 dependencies = [
     "numpy>=2.4,<3.0",
     "scipy>=1.17,<2.0",
-    "plotly>=7.0,<8.0",
-    "kaleido>=1.3.0",
+    "plotly==4.12.0", 
+    "kaleido==0.2.1"
 ]
 
 [project.optional-dependencies]

{ecoengine-3.2.2 → ecoengine-3.2.4}/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.2 → ecoengine-3.2.4}/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.2 → ecoengine-3.2.4}/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.2 → ecoengine-3.2.4}/src/ecoengine.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: ecoengine
-Version: 3.2.2
+Version: 3.2.4
 Requires-Python: >=3.11
 Requires-Dist: numpy<3.0,>=2.4
 Requires-Dist: scipy<2.0,>=1.17
-Requires-Dist: plotly<8.0,>=7.0
-Requires-Dist: kaleido>=1.3.0
+Requires-Dist: plotly==4.12.0
+Requires-Dist: kaleido==0.2.1
 Provides-Extra: docs
 Requires-Dist: sphinx>=6; extra == "docs"
 Requires-Dist: furo; extra == "docs"

{ecoengine-3.2.2 → ecoengine-3.2.4}/src/ecoengine.egg-info/requires.txt

@@ -1,7 +1,7 @@
 numpy<3.0,>=2.4
 scipy<2.0,>=1.17
-plotly<8.0,>=7.0
-kaleido>=1.3.0
+plotly==4.12.0
+kaleido==0.2.1
 
 [docs]
 sphinx>=6