Update app/hvac_loads.py

app/hvac_loads.py

@@ -61,17 +61,17 @@ class AdaptiveComfortModel:
         for i, key in enumerate(daily_keys):
             trm = running_means[i]
             if acceptability == "80":
-                t_min = 0.31 * trm + 13.5
-                t_max = 0.31 * trm + 22.5
+                t_min = 0.31 * trm + 14.3 - 3.0
+                t_max = 0.31 * trm + 14.3 + 3.0
             elif acceptability == "85":
-                t_min = 0.31 * trm + 13.9
-                t_max = 0.31 * trm + 22.1
+                t_min = 0.31 * trm + 14.3 - 2.5
+                t_max = 0.31 * trm + 14.3 + 2.5
             elif acceptability == "95":
-                t_min = 0.31 * trm + 14.7
-                t_max = 0.31 * trm + 20.7
+                t_min = 0.31 * trm + 14.3 - 1.5
+                t_max = 0.31 * trm + 14.3 + 1.5
             else:  # Default to 90%
-                t_min = 0.31 * trm + 14.3
-                t_max = 0.31 * trm + 21.3
+                t_min = 0.31 * trm + 14.3 - 2.0
+                t_max = 0.31 * trm + 14.3 + 2.0
             setpoints[key] = (t_min + t_max) / 2
         return setpoints
 
@@ -809,7 +809,27 @@ class TFMCalculations:
                         total_surface_area += comp_area
                         opaque_components.append(comp)
         logger.debug(f"Total surface area for opaque components: {total_surface_area:.2f} m²")
-    
+
+        unmet_hours = 0
+        for hour_data in filtered_data:
+            hour = hour_data["hour"]
+            outdoor_temp = hour_data["dry_bulb"]
+            month = hour_data["month"]
+            day = hour_data["day"]
+            ground_temp = ground_temperatures.get("0.5", [20.0]*12)[month-1] if ground_temperatures else 20.0
+            logger.debug(f"Ground temperature for month {month}: {ground_temp:.1f}°C")
+            
+            indoor_cond = TFMCalculations.get_indoor_conditions(indoor_conditions, hour, outdoor_temp, month, day, adaptive_setpoints)
+            indoor_temp = indoor_cond["temperature"]
+            
+            if indoor_conditions["type"] == "ASHRAE 55 Adaptive Comfort":
+                key = (hour_data["month"], hour_data["day"])
+                t_comf = adaptive_setpoints.get(key, 24.0)
+                t_min = t_comf - (2.0 if indoor_conditions.get("adaptive_acceptability", "90") == "90" else 3.0)
+                t_max = t_comf + (2.0 if indoor_conditions.get("adaptive_acceptability", "90") == "90" else 3.0)
+                if indoor_temp < t_min or indoor_temp > t_max:
+                    unmet_hours += 1
+                    
         for hour_data in filtered_data:
             hour = hour_data["hour"]
             outdoor_temp = hour_data["dry_bulb"]
@@ -948,7 +968,8 @@ class TFMCalculations:
                 "total_heating": total_heating,
                 "ground_temperature": ground_temp,
                 "solar_by_orientation": dict(solar_by_orientation),
-                "conduction_by_orientation": dict(conduction_by_orientation)
+                "conduction_by_orientation": dict(conduction_by_orientation),
+                "unmet_hours": unmet_hours
             })
     
         loads_by_day = defaultdict(list)
@@ -994,7 +1015,6 @@ def display_hvac_results_ui(loads: List[Dict[str, Any]], run_id: str = "default"
         if peak_cooling:
             st.write(f"**Peak Cooling Load**: {peak_cooling['total_cooling']:.2f} kW")
             st.write(f"Occurred on: {peak_cooling['month']}/{peak_cooling['day']} at {peak_cooling['hour']}:00")
-            # Add ventilation and infiltration sensible/latent metrics
             vent_sensible = sum(system.get("sensible_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("ventilation", []))
             vent_latent = sum(system.get("latent_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("ventilation", []))
             inf_sensible = sum(system.get("sensible_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("infiltration", []))
@@ -1003,12 +1023,14 @@ def display_hvac_results_ui(loads: List[Dict[str, Any]], run_id: str = "default"
             st.metric("Ventilation Latent Cooling", f"{vent_latent:.2f} kW")
             st.metric("Infiltration Sensible Cooling", f"{inf_sensible:.2f} kW")
             st.metric("Infiltration Latent Cooling", f"{inf_latent:.2f} kW")
+            st.metric("Unmet Hours (Adaptive Comfort)", loads[-1].get("unmet_hours", 0))
         else:
             st.write("**Peak Cooling Load**: 0.00 kW")
             st.metric("Ventilation Sensible Cooling", "0.00 kW")
             st.metric("Ventilation Latent Cooling", "0.00 kW")
             st.metric("Infiltration Sensible Cooling", "0.00 kW")
             st.metric("Infiltration Latent Cooling", "0.00 kW")
+            st.metric("Unmet Hours (Adaptive Comfort)", loads[-1].get("unmet_hours", 0) if loads else 0)
     
     with col2:
         st.subheader("Heating Equipment Sizing")