Update utils/cooling_load.py

utils/cooling_load.py

@@ -5,7 +5,7 @@ Reference: ASHRAE Handbook—Fundamentals (2017), Chapter 18, Section 18.5.
 
 Author: Dr Majed Abuseif
 Date: April 2025
-Version: 1.0.6
+Version: 1.0.7
 """
 
 from typing import Dict, List, Any, Optional, Tuple
@@ -14,7 +14,7 @@ import logging
 from data.ashrae_tables import ASHRAETables
 from utils.heat_transfer import HeatTransferCalculations
 from utils.psychrometrics import Psychrometrics
-from app.component_selection import Wall, Roof, Window, Door, Orientation
+from app.component_selection import Wall, Roof, Window, Door, Skylight, Orientation
 from data.drapery import Drapery
 
 # Set up logging
@@ -220,6 +220,7 @@ class CoolingLoadCalculator:
             'windows_conduction': {h: 0.0 for h in range(1, 25)},
             'windows_solar': {h: 0.0 for h in range(1, 25)},
             'doors': {h: 0.0 for h in range(1, 25)},
+            'skylights': {h: 0.0 for h in range(1, 25)},  # Added for skylights
             'people_sensible': {h: 0.0 for h in range(1, 25)},
             'people_latent': {h: 0.0 for h in range(1, 25)},
             'lights': {h: 0.0 for h in range(1, 25)},
@@ -237,7 +238,7 @@ class CoolingLoadCalculator:
                 outdoor_conditions['temperature'],
                 indoor_conditions['temperature'],
                 outdoor_conditions.get('relative_humidity', 50.0),
-                indoor_conditions.get('relative_humidity', 50.0)
+                indoor_conditions.get('relative_hierarchy', 50.0)
             )
             
             latitude = self.validate_latitude(outdoor_conditions.get('latitude', '32N'))
@@ -283,7 +284,10 @@ class CoolingLoadCalculator:
                         month=month,
                         hour=hour,
                         latitude=latitude,
-                        shading_coefficient=window.shading_coefficient
+                        shading_coefficient=window.shading_coefficient,
+                        adjusted_shgc=window.shgc,  # Default to base SHGC
+                        glazing_type=window.glazing_type,
+                        frame_type=window.frame_type
                     )
                     hourly_loads['windows_conduction'][hour + 1] += load_dict['conduction']
                     hourly_loads['windows_solar'][hour + 1] += load_dict['solar']
@@ -298,6 +302,23 @@ class CoolingLoadCalculator:
                     )
                     hourly_loads['doors'][hour + 1] += load
             
+            # Calculate loads for skylights
+            for skylight in building_components.get('skylights', []):
+                for hour in range(24):
+                    load_dict = self.calculate_skylight_cooling_load(
+                        skylight=skylight,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature'],
+                        month=month,
+                        hour=hour,
+                        latitude=latitude,
+                        shading_coefficient=skylight.shading_coefficient,
+                        adjusted_shgc=skylight.shgc,  # Default to base SHGC
+                        glazing_type=skylight.glazing_type,
+                        frame_type=skylight.frame_type
+                    )
+                    hourly_loads['skylights'][hour + 1] += load_dict['total']
+            
             # Calculate internal loads
             for hour in range(24):
                 # People loads
@@ -382,6 +403,7 @@ class CoolingLoadCalculator:
                     hourly_loads['windows_conduction'][hour],
                     hourly_loads['windows_solar'][hour],
                     hourly_loads['doors'][hour],
+                    hourly_loads['skylights'][hour],  # Added for skylights
                     hourly_loads['people_sensible'][hour],
                     hourly_loads['people_latent'][hour],
                     hourly_loads['lights'][hour],
@@ -403,6 +425,7 @@ class CoolingLoadCalculator:
                 'windows_conduction': hourly_loads['windows_conduction'][design_hour],
                 'windows_solar': hourly_loads['windows_solar'][design_hour],
                 'doors': hourly_loads['doors'][design_hour],
+                'skylights': hourly_loads['skylights'][design_hour],  # Added for skylights
                 'people_sensible': hourly_loads['people_sensible'][design_hour],
                 'people_latent': hourly_loads['people_latent'][design_hour],
                 'lights': hourly_loads['lights'][design_hour],
@@ -439,6 +462,7 @@ class CoolingLoadCalculator:
                 design_loads['windows_conduction'] +
                 design_loads['windows_solar'] +
                 design_loads['doors'] +
+                design_loads['skylights'] +  # Added for skylights
                 design_loads['people_sensible'] +
                 design_loads['lights'] +
                 design_loads['equipment_sensible'] +
@@ -634,7 +658,10 @@ class CoolingLoadCalculator:
         month: str,
         hour: int,
         latitude: str,
-        shading_coefficient: float
+        shading_coefficient: float,
+        adjusted_shgc: float,
+        glazing_type: Any,
+        frame_type: Any
     ) -> Dict[str, float]:
         """
         Calculate cooling load for a window (conduction and solar).
@@ -648,6 +675,9 @@ class CoolingLoadCalculator:
             hour: Hour of the day
             latitude: Latitude (e.g., '24N')
             shading_coefficient: Default shading coefficient
+            adjusted_shgc: Adjusted SHGC accounting for drapery (from Drapery.get_shading_coefficient)
+            glazing_type: Window glazing type
+            frame_type: Window frame type
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
@@ -663,19 +693,10 @@ class CoolingLoadCalculator:
             cltd = outdoor_temp - indoor_temp
             conduction_load = window.u_value * window.area * cltd
 
-            # Determine shading coefficient
-            effective_shading_coefficient = shading_coefficient
-            if hasattr(window, 'drapery') and window.drapery and window.drapery.enabled:
-                try:
-                    effective_shading_coefficient = window.drapery.get_shading_coefficient(window.shgc)
-                    if self.debug_mode:
-                        logger.debug(f"Using drapery shading coefficient: {effective_shading_coefficient}")
-                except Exception as e:
-                    if self.debug_mode:
-                        logger.warning(f"Error getting drapery shading coefficient: {str(e)}. Using default shading_coefficient={shading_coefficient}")
-            else:
-                if self.debug_mode:
-                    logger.debug(f"No enabled drapery. Using default shading_coefficient={shading_coefficient}")
+            # Use adjusted_shgc if provided, otherwise fall back to shading_coefficient
+            effective_shading_coefficient = adjusted_shgc if adjusted_shgc is not None else shading_coefficient
+            if self.debug_mode:
+                logger.debug(f"Window {window.name}: adjusted_shgc={adjusted_shgc}, effective_shading_coefficient={effective_shading_coefficient}")
 
             # Solar load
             try:
@@ -708,6 +729,85 @@ class CoolingLoadCalculator:
                 logger.error(f"Error in calculate_window_cooling_load: {str(e)}")
             raise Exception(f"Error in calculate_window_cooling_load: {str(e)}")
     
+    def calculate_skylight_cooling_load(
+        self,
+        skylight: Skylight,
+        outdoor_temp: float,
+        indoor_temp: float,
+        month: str,
+        hour: int,
+        latitude: str,
+        shading_coefficient: float,
+        adjusted_shgc: float,
+        glazing_type: Any,
+        frame_type: Any
+    ) -> Dict[str, float]:
+        """
+        Calculate cooling load for a skylight (conduction and solar).
+        Reference: ASHRAE Handbook—Fundamentals (2017), Chapter 18, Equations 18.12-18.13.
+        
+        Args:
+            skylight: Skylight component
+            outdoor_temp: Outdoor temperature (°C)
+            indoor_temp: Indoor temperature (°C)
+            month: Design month
+            hour: Hour of the day
+            latitude: Latitude (e.g., '24N')
+            shading_coefficient: Default shading coefficient
+            adjusted_shgc: Adjusted SHGC accounting for drapery (from Drapery.get_shading_coefficient)
+            glazing_type: Skylight glazing type
+            frame_type: Skylight frame type
+            
+        Returns:
+            Dictionary with conduction, solar, and total loads in Watts
+        """
+        try:
+            latitude = self.validate_latitude(latitude)
+            month = self.validate_month(month)
+            hour = self.validate_hour(hour)
+            if self.debug_mode:
+                logger.debug(f"calculate_skylight_cooling_load: latitude={latitude}, month={month}, hour={hour}, orientation=Horizontal")
+
+            # Conduction load
+            cltd = outdoor_temp - indoor_temp
+            conduction_load = skylight.u_value * skylight.area * cltd
+
+            # Use adjusted_shgc if provided, otherwise fall back to shading_coefficient
+            effective_shading_coefficient = adjusted_shgc if adjusted_shgc is not None else shading_coefficient
+            if self.debug_mode:
+                logger.debug(f"Skylight {skylight.name}: adjusted_shgc={adjusted_shgc}, effective_shading_coefficient={effective_shading_coefficient}")
+
+            # Solar load (skylights use horizontal orientation)
+            try:
+                scl = self.ashrae_tables.get_scl(
+                    latitude=latitude,
+                    month=month,
+                    orientation='Horizontal',
+                    hour=hour
+                )
+            except Exception as e:
+                if self.debug_mode:
+                    logger.error(f"get_scl failed for latitude={latitude}, month={month}, orientation=Horizontal: {str(e)}")
+                    logger.warning("Using default SCL=100 W/m²")
+                scl = 100.0
+
+            solar_load = skylight.area * skylight.shgc * effective_shading_coefficient * scl
+
+            total_load = conduction_load + solar_load
+            if self.debug_mode:
+                logger.debug(f"Skylight load: conduction={conduction_load}, solar={solar_load}, total={total_load}, effective_shading_coefficient={effective_shading_coefficient}")
+
+            return {
+                'conduction': max(conduction_load, 0.0),
+                'solar': max(solar_load, 0.0),
+                'total': max(total_load, 0.0)
+            }
+        
+        except Exception as e:
+            if self.debug_mode:
+                logger.error(f"Error in calculate_skylight_cooling_load: {str(e)}")
+            raise Exception(f"Error in calculate_skylight_cooling_load: {str(e)}")
+    
     def calculate_door_cooling_load(
         self,
         door: Door,
@@ -1036,7 +1136,8 @@ if __name__ == "__main__":
         'walls': [Wall(id="w1", name="North Wall", area=20.0, u_value=0.5, orientation=Orientation.NORTH, wall_group='A', solar_absorptivity=0.6)],
         'roofs': [Roof(id="r1", name="Main Roof", area=100.0, u_value=0.3, orientation=Orientation.HORIZONTAL, roof_group='A', solar_absorptivity=0.6)],
         'windows': [Window(id="win1", name="South Window", area=10.0, u_value=2.8, orientation=Orientation.SOUTH, shgc=0.7, shading_coefficient=0.8)],
-        'doors': [Door(id="d1", name="Main Door", area=2.0, u_value=2.0, orientation=Orientation.NORTH)]
+        'doors': [Door(id="d1", name="Main Door", area=2.0, u_value=2.0, orientation=Orientation.NORTH)],
+        'skylights': [Skylight(id="sky1", name="Roof Skylight", area=5.0, u_value=3.0, shgc=0.6, shading_coefficient=0.9)]
     }
     outdoor_conditions = {
         'temperature': 35.0,