Update utils/heating_load.py

utils/heating_load.py

@@ -271,33 +271,58 @@ class HeatingLoadCalculator:
         return max(0, load)
     
     # ENHANCEMENT: Added skylight heating load calculation
-    def calculate_skylight_heating_load(self, skylight: Skylight, outdoor_temp: float, indoor_temp: float) -> float:
+    def calculate_skylight_heating_load(self, skylight: Skylight, outdoor_temp: float, indoor_temp: float, frame_type: Optional[str] = None) -> float:
         """
         Calculate heating load for a skylight.
         Reference: ASHRAE Handbook—Fundamentals (2017), Chapter 18, Equation 18.1.
-        
+    
         Args:
             skylight: Skylight component
             outdoor_temp: Outdoor temperature in °C
             indoor_temp: Indoor temperature in °C
-            
+            frame_type: Type of skylight 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
-        
-        # Skylights typically have higher U-values due to their horizontal orientation
-        # Apply a 10% increase to account for this
-        adjusted_u_value = skylight.u_value * 1.1
-        
+    
+        # Initialize adjusted U-value
+        adjusted_u_value = skylight.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(skylight, 'frame_type') and skylight.frame_type:
+            # Fallback to skylight.frame_type if frame_type not provided
+            adjustment = frame_adjustments.get(skylight.frame_type, 1.0)
+            adjusted_u_value *= adjustment
+    
+        # Adjust U-value for drapery based on drapery_openness
+        if hasattr(skylight, 'drapery_openness') and skylight.drapery_openness != 'Open':
+            drapery_reduction = {
+                'Closed': 0.20,
+                'Semi-Open': 0.10,
+                'Open': 0.0
+            }.get(skylight.drapery_openness, 0.15)
+            adjusted_u_value *= (1 - drapery_reduction)
+    
         load = self.heat_transfer.conduction_heat_transfer(adjusted_u_value, skylight.area, delta_t)
-        
+    
         # Log detailed information in debug mode
         if self.debug_mode:
-            logger.debug(f"Skylight {skylight.name} heating load: u_value={adjusted_u_value}, area={skylight.area}, delta_t={delta_t}, load={load:.2f} W")
-        
+            logger.debug(f"Skylight {skylight.name} heating load: u_value={adjusted_u_value}, area={skylight.area}, delta_t={delta_t}, frame_type={frame_type or skylight.frame_type}, load={load:.2f} W")
+    
         return max(0, load)
 
     def calculate_infiltration_heating_load(self, indoor_conditions: Dict[str, float],