Update utils/heating_load.py

utils/heating_load.py

@@ -175,29 +175,48 @@ class HeatingLoadCalculator:
         
         return max(0, load)
 
-    def calculate_window_heating_load(self, window: Window, outdoor_temp: float, indoor_temp: float) -> float:
+    def calculate_window_heating_load(self, window: Window, outdoor_temp: float, indoor_temp: float, frame_type: Optional[str] = None) -> float:
         """
         Calculate heating load for a window.
         Reference: ASHRAE Handbook—Fundamentals (2017), Chapter 18, Equation 18.1.
-        
+    
         Args:
             window: Window component
             outdoor_temp: Outdoor temperature in °C
             indoor_temp: Indoor temperature in °C
-            
+            frame_type: Type of window frame (optional, e.g., 'Aluminum without Thermal Break')
+        
         Returns:
             Heating load in W
         """
         delta_t = indoor_temp - outdoor_temp
         if delta_t <= 1:
             return 0.0
-        
-        # ENHANCEMENT: Adjust U-value if window has drapery
+    
+        # Initialize adjusted U-value
         adjusted_u_value = window.u_value
+    
+        # Adjust U-value based on frame_type if provided
+        frame_adjustments = {
+            'Aluminum without Thermal Break': 1.0,
+            'Aluminum with Thermal Break': 0.8,
+            'Vinyl/Fiberglass': 0.6,
+            'Wood/Vinyl-Clad Wood': 0.5,
+            'Insulated': 0.4
+        }
+        if frame_type:
+            adjustment = frame_adjustments.get(frame_type, 1.0)
+            adjusted_u_value *= adjustment
+        elif hasattr(window, 'frame_type') and window.frame_type:
+            # Fallback to window.frame_type if frame_type not provided
+            adjustment = frame_adjustments.get(window.frame_type, 1.0)
+            adjusted_u_value *= adjustment
+    
+        # Adjust U-value if window has drapery
         if hasattr(window, 'has_drapery') and window.has_drapery:
             # Simple U-value adjustment for drapery (typically reduces U-value by 10-20%)
             drapery_reduction = 0.15  # 15% reduction as a default
-            
+        
             # More detailed adjustment if drapery properties are available
             if hasattr(window, 'drapery_type'):
                 drapery_reductions = {
@@ -209,15 +228,15 @@ class HeatingLoadCalculator:
                     'Blackout': 0.25
                 }
                 drapery_reduction = drapery_reductions.get(window.drapery_type, 0.15)
-            
-            adjusted_u_value = window.u_value * (1 - drapery_reduction)
         
+            adjusted_u_value *= (1 - drapery_reduction)
+    
         load = self.heat_transfer.conduction_heat_transfer(adjusted_u_value, window.area, delta_t)
-        
-        # ENHANCEMENT: Log detailed information in debug mode
+    
+        # Log detailed information in debug mode
         if self.debug_mode:
-            logger.debug(f"Window {window.name} heating load: u_value={adjusted_u_value}, area={window.area}, delta_t={delta_t}, load={load:.2f} W")
-        
+            logger.debug(f"Window {window.name} heating load: u_value={adjusted_u_value}, area={window.area}, delta_t={delta_t}, frame_type={frame_type or window.frame_type}, load={load:.2f} W")
+    
         return max(0, load)
 
     def calculate_door_heating_load(self, door: Door, outdoor_temp: float, indoor_temp: float) -> float: