Update utils/cooling_load.py

utils/cooling_load.py

@@ -4,8 +4,8 @@ Implements ASHRAE steady-state methods with Cooling Load Temperature Difference
 Reference: ASHRAE Handbook—Fundamentals (2017), Chapter 18, Section 18.5.
 
 Author: Dr Majed Abuseif
-Date: April 2025
-Version: 1.0.7
+Date: May 2025
+Version: 1.0.8
 """
 
 from typing import Dict, List, Any, Optional, Tuple
@@ -279,6 +279,8 @@ class CoolingLoadCalculator:
             for window in building_components.get('windows', []):
                 for hour in range(24):
                     adjusted_shgc = getattr(window, 'adjusted_shgc', None)
+                    glazing_type = getattr(window, 'glazing_type', None)
+                    frame_type = getattr(window, 'frame_type', None)
                     load_dict = self.calculate_window_cooling_load(
                         window=window,
                         outdoor_temp=outdoor_conditions['temperature'],
@@ -287,7 +289,9 @@ class CoolingLoadCalculator:
                         hour=hour,
                         latitude=latitude,
                         shading_coefficient=window.shading_coefficient,
-                        adjusted_shgc=adjusted_shgc
+                        adjusted_shgc=adjusted_shgc,
+                        glazing_type=glazing_type,
+                        frame_type=frame_type
                     )
                     hourly_loads['windows_conduction'][hour + 1] += load_dict['conduction']
                     hourly_loads['windows_solar'][hour + 1] += load_dict['solar']
@@ -296,6 +300,8 @@ class CoolingLoadCalculator:
             for skylight in building_components.get('skylights', []):
                 for hour in range(24):
                     adjusted_shgc = getattr(skylight, 'adjusted_shgc', None)
+                    glazing_type = getattr(skylight, 'glazing_type', None)
+                    frame_type = getattr(skylight, 'frame_type', None)
                     load_dict = self.calculate_skylight_cooling_load(
                         skylight=skylight,
                         outdoor_temp=outdoor_conditions['temperature'],
@@ -304,7 +310,9 @@ class CoolingLoadCalculator:
                         hour=hour,
                         latitude=latitude,
                         shading_coefficient=skylight.shading_coefficient,
-                        adjusted_shgc=adjusted_shgc
+                        adjusted_shgc=adjusted_shgc,
+                        glazing_type=glazing_type,
+                        frame_type=frame_type
                     )
                     hourly_loads['skylights_conduction'][hour + 1] += load_dict['conduction']
                     hourly_loads['skylights_solar'][hour + 1] += load_dict['solar']
@@ -662,7 +670,9 @@ class CoolingLoadCalculator:
         hour: int,
         latitude: str,
         shading_coefficient: float,
-        adjusted_shgc: Optional[float] = None
+        adjusted_shgc: Optional[float] = None,
+        glazing_type: Optional[str] = None,
+        frame_type: Optional[str] = None
     ) -> Dict[str, float]:
         """
         Calculate cooling load for a window (conduction and solar).
@@ -677,6 +687,8 @@ class CoolingLoadCalculator:
             latitude: Latitude (e.g., '24N')
             shading_coefficient: Default shading coefficient
             adjusted_shgc: Adjusted SHGC from external drapery calculation (optional)
+            glazing_type: Type of glazing (e.g., 'Single Clear', 'Double Tinted') (optional)
+            frame_type: Type of frame (e.g., 'Aluminum', 'Vinyl') (optional)
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
@@ -686,17 +698,31 @@ class CoolingLoadCalculator:
             month = self.validate_month(month)
             hour = self.validate_hour(hour)
             if self.debug_mode:
-                logger.debug(f"calculate_window_cooling_load: latitude={latitude}, month={month}, hour={hour}, orientation={window.orientation.value}")
+                logger.debug(f"calculate_window_cooling_load: latitude={latitude}, month={month}, hour={hour}, orientation={window.orientation.value}, glazing_type={glazing_type}, frame_type={frame_type}")
+
+            # Fetch U-factor and SHGC from Drapery if glazing_type and frame_type are provided
+            u_value = window.u_value
+            shgc = window.shgc
+            if glazing_type and frame_type:
+                try:
+                    drapery = Drapery()
+                    u_value = drapery.WINDOW_U_FACTORS.get((glazing_type, frame_type), window.u_value)
+                    shgc = drapery.WINDOW_SHGC.get((glazing_type, frame_type), window.shgc)
+                    if self.debug_mode:
+                        logger.debug(f"Using Drapery values: u_value={u_value}, shgc={shgc} for glazing_type={glazing_type}, frame_type={frame_type}")
+                except Exception as e:
+                    if self.debug_mode:
+                        logger.warning(f"Error fetching Drapery values for glazing_type={glazing_type}, frame_type={frame_type}: {str(e)}. Using default u_value={u_value}, shgc={shgc}")
 
             # Conduction load
             cltd = outdoor_temp - indoor_temp
-            conduction_load = window.u_value * window.area * cltd
+            conduction_load = u_value * window.area * cltd
 
             # Determine shading coefficient
             effective_shading_coefficient = adjusted_shgc if adjusted_shgc is not None else shading_coefficient
             if adjusted_shgc is None and hasattr(window, 'drapery') and window.drapery and window.drapery.enabled:
                 try:
-                    effective_shading_coefficient = window.drapery.get_shading_coefficient(window.shgc)
+                    effective_shading_coefficient = window.drapery.get_shading_coefficient(shgc)
                     if self.debug_mode:
                         logger.debug(f"Using drapery shading coefficient: {effective_shading_coefficient}")
                 except Exception as e:
@@ -720,7 +746,7 @@ class CoolingLoadCalculator:
                     logger.warning("Using default SCL=100 W/m²")
                 scl = 100.0
 
-            solar_load = window.area * window.shgc * effective_shading_coefficient * scl
+            solar_load = window.area * shgc * effective_shading_coefficient * scl
 
             total_load = conduction_load + solar_load
             if self.debug_mode:
@@ -746,7 +772,9 @@ class CoolingLoadCalculator:
         hour: int,
         latitude: str,
         shading_coefficient: float,
-        adjusted_shgc: Optional[float] = None
+        adjusted_shgc: Optional[float] = None,
+        glazing_type: Optional[str] = None,
+        frame_type: Optional[str] = None
     ) -> Dict[str, float]:
         """
         Calculate cooling load for a skylight (conduction and solar).
@@ -761,6 +789,8 @@ class CoolingLoadCalculator:
             latitude: Latitude (e.g., '24N')
             shading_coefficient: Default shading coefficient
             adjusted_shgc: Adjusted SHGC from external drapery calculation (optional)
+            glazing_type: Type of glazing (e.g., 'Single Clear', 'Double Tinted') (optional)
+            frame_type: Type of frame (e.g., 'Aluminum', 'Vinyl') (optional)
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
@@ -770,17 +800,31 @@ class CoolingLoadCalculator:
             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")
+                logger.debug(f"calculate_skylight_cooling_load: latitude={latitude}, month={month}, hour={hour}, orientation=Horizontal, glazing_type={glazing_type}, frame_type={frame_type}")
+
+            # Fetch U-factor and SHGC from Drapery if glazing_type and frame_type are provided
+            u_value = skylight.u_value
+            shgc = skylight.shgc
+            if glazing_type and frame_type:
+                try:
+                    drapery = Drapery()
+                    u_value = drapery.SKYLIGHT_U_FACTORS.get((glazing_type, frame_type), skylight.u_value)
+                    shgc = drapery.SKYLIGHT_SHGC.get((glazing_type, frame_type), skylight.shgc)
+                    if self.debug_mode:
+                        logger.debug(f"Using Drapery values: u_value={u_value}, shgc={shgc} for glazing_type={glazing_type}, frame_type={frame_type}")
+                except Exception as e:
+                    if self.debug_mode:
+                        logger.warning(f"Error fetching Drapery values for glazing_type={glazing_type}, frame_type={frame_type}: {str(e)}. Using default u_value={u_value}, shgc={shgc}")
 
             # Conduction load
             cltd = outdoor_temp - indoor_temp
-            conduction_load = skylight.u_value * skylight.area * cltd
+            conduction_load = u_value * skylight.area * cltd
 
             # Determine shading coefficient
             effective_shading_coefficient = adjusted_shgc if adjusted_shgc is not None else shading_coefficient
             if adjusted_shgc is None and hasattr(skylight, 'drapery') and skylight.drapery and skylight.drapery.enabled:
                 try:
-                    effective_shading_coefficient = skylight.drapery.get_shading_coefficient(skylight.shgc)
+                    effective_shading_coefficient = skylight.drapery.get_shading_coefficient(shgc)
                     if self.debug_mode:
                         logger.debug(f"Using drapery shading coefficient: {effective_shading_coefficient}")
                 except Exception as e:
@@ -804,7 +848,7 @@ class CoolingLoadCalculator:
                     logger.warning("Using default SCL=100 W/m²")
                 scl = 100.0
 
-            solar_load = skylight.area * skylight.shgc * effective_shading_coefficient * scl
+            solar_load = skylight.area * shgc * effective_shading_coefficient * scl
 
             total_load = conduction_load + solar_load
             if self.debug_mode:
@@ -1148,7 +1192,7 @@ if __name__ == "__main__":
     components = {
         '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)],
+        'windows': [Window(id="win1", name="South Window", area=10.0, u_value=2.8, orientation=Orientation.SOUTH, shgc=0.7, shading_coefficient=0.8, glazing_type='Single Clear', frame_type='Aluminum')],
         'doors': [Door(id="d1", name="Main Door", area=2.0, u_value=2.0, orientation=Orientation.NORTH)]
     }
     outdoor_conditions = {