Update data/calculation.py

data/calculation.py

@@ -23,21 +23,21 @@ class ComponentType(Enum):
     SKYLIGHT = "Skylight"
 
 class TFMCalculations:
-    @staticmethod
+@staticmethod
     def calculate_conduction_load(component, outdoor_temp: float, indoor_temp: float, hour: int, mode: str = "none") -> tuple[float, float]:
         """Calculate conduction load for heating and cooling in kW based on mode."""
         if mode == "none":
             return 0, 0
         delta_t = outdoor_temp - indoor_temp
+        if mode == "cooling" and delta_t <= 0:
+            return 0, 0
+        if mode == "heating" and delta_t >= 0:
+            return 0, 0
         load = component.u_value * component.area * delta_t
         for i, ctf in enumerate(component.ctf):
             load += ctf * (outdoor_temp - indoor_temp) * np.exp(-i * 3600 / 3600)
-        if mode == "cooling":
-            cooling_load = max(load, 0) / 1000  # Positive for cooling (kW)
-            heating_load = 0
-        elif mode == "heating":
-            cooling_load = 0
-            heating_load = max(-load, 0) / 1000  # Positive for heating (kW)
+        cooling_load = load / 1000 if mode == "cooling" else 0
+        heating_load = -load / 1000 if mode == "heating" else 0
         return cooling_load, heating_load
 
     @staticmethod
@@ -91,13 +91,13 @@ class TFMCalculations:
         air_density = 1.2  # kg/m³
         specific_heat = 1000  # J/kg·K
         delta_t = outdoor_temp - indoor_temp
+        if mode == "cooling" and delta_t <= 0:
+            return 0, 0
+        if mode == "heating" and delta_t >= 0:
+            return 0, 0
         load = ventilation_flow * air_density * specific_heat * delta_t / 1000  # kW
-        if mode == "cooling":
-            cooling_load = max(load, 0)
-            heating_load = 0
-        elif mode == "heating":
-            cooling_load = 0
-            heating_load = max(-load, 0)
+        cooling_load = load if mode == "cooling" else 0
+        heating_load = -load if mode == "heating" else 0
         return cooling_load, heating_load
 
     @staticmethod
@@ -115,6 +115,10 @@ class TFMCalculations:
         air_density = 1.2  # kg/m³
         specific_heat = 1000  # J/kg·K
         delta_t = outdoor_temp - indoor_temp
+        if mode == "cooling" and delta_t <= 0:
+            return 0, 0
+        if mode == "heating" and delta_t >= 0:
+            return 0, 0
         if method == "ACH":
             ach = settings.get("rate", 0.5)
             infiltration_flow = ach * volume / 3600  # m³/s
@@ -128,12 +132,8 @@ class TFMCalculations:
             delta_t_abs = abs(delta_t)
             infiltration_flow = c * (delta_t_abs ** n) * area / 3600  # m³/s
         load = infiltration_flow * air_density * specific_heat * delta_t / 1000  # kW
-        if mode == "cooling":
-            cooling_load = max(load, 0)
-            heating_load = 0
-        elif mode == "heating":
-            cooling_load = 0
-            heating_load = max(-load, 0)
+        cooling_load = load if mode == "cooling" else 0
+        heating_load = -load if mode == "heating" else 0
         return cooling_load, heating_load
 
     @staticmethod
@@ -247,6 +247,11 @@ class TFMCalculations:
             # Calculate total loads, subtracting internal load for heating
             total_cooling = conduction_cooling + solar + internal + ventilation_cooling + infiltration_cooling
             total_heating = max(conduction_heating + ventilation_heating + infiltration_heating - internal, 0)
+            # Enforce mutual exclusivity
+            if mode == "cooling":
+                total_heating = 0
+            elif mode == "heating":
+                total_cooling = 0
             loads.append({
                 "hour": hour,
                 "month": hour_data["month"],