Update utils/cooling_load.py

utils/cooling_load.py

@@ -15,7 +15,7 @@ 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, Skylight, Orientation
-from data.drapery import Drapery
+from data.drapery import Drapery, GlazingType, FrameType, WINDOW_U_FACTORS, WINDOW_SHGC, SKYLIGHT_U_FACTORS, SKYLIGHT_SHGC, CLTDCalculator
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
@@ -662,7 +662,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 +679,8 @@ class CoolingLoadCalculator:
             latitude: Latitude (e.g., '24N')
             shading_coefficient: Default shading coefficient
             adjusted_shgc: Adjusted SHGC from external drapery calculation (optional)
+            glazing_type: Glazing type (e.g., 'Single Clear', 'Double Tinted') (optional)
+            frame_type: Frame type (e.g., 'Aluminum without Thermal Break') (optional)
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
@@ -686,17 +690,55 @@ 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}")
 
-            # Conduction load
-            cltd = outdoor_temp - indoor_temp
-            conduction_load = window.u_value * window.area * cltd
+            # Initialize CLTDCalculator
+            cltd_calculator = CLTDCalculator(
+                indoor_temp=indoor_temp,
+                outdoor_max_temp=outdoor_temp,
+                outdoor_daily_range=11.7,  # Default from drapery.py
+                latitude=latitude,
+                month=month
+            )
+
+            # Determine U-factor and SHGC
+            u_value = window.u_value
+            shgc = window.shgc
+            if glazing_type and frame_type:
+                try:
+                    glazing_enum = next(g for g in GlazingType if g.value == glazing_type)
+                    frame_enum = next(f for f in FrameType if f.value == frame_type)
+                    u_value = WINDOW_U_FACTORS.get((glazing_enum, frame_enum), window.u_value)
+                    shgc = WINDOW_SHGC.get((glazing_enum, frame_enum), window.shgc)
+                    if self.debug_mode:
+                        logger.debug(f"Using table values: u_value={u_value}, shgc={shgc} for glazing_type={glazing_type}, frame_type={frame_type}")
+                except StopIteration:
+                    if self.debug_mode:
+                        logger.warning(f"Invalid glazing_type={glazing_type} or frame_type={frame_type}. Using default u_value={u_value}, shgc={shgc}")
+
+            # Conduction load using CLTD
+            try:
+                glazing_key = glazing_type if glazing_type in ['Single Clear', 'Double Tinted', 'Low-E', 'Reflective'] else 'SingleClear'
+                cltd = cltd_calculator.get_cltd_window(
+                    glazing_type=glazing_key,
+                    orientation=window.orientation.value,
+                    hour=hour
+                )
+                if self.debug_mode:
+                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}")
+            except Exception as e:
+                if self.debug_mode:
+                    logger.error(f"get_cltd_window failed for glazing_type={glazing_key}: {str(e)}")
+                    logger.warning("Using default CLTD=8.0°C")
+                cltd = 8.0
+
+            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,11 +762,11 @@ 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:
-                logger.debug(f"Window load: conduction={conduction_load}, solar={solar_load}, total={total_load}, effective_shading_coefficient={effective_shading_coefficient}")
+                logger.debug(f"Window load: conduction={conduction_load}, solar={solar_load}, total={total_load}, u_value={u_value}, shgc={shgc}, cltd={cltd}, effective_shading_coefficient={effective_shading_coefficient}")
 
             return {
                 'conduction': max(conduction_load, 0.0),
@@ -746,7 +788,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 +805,8 @@ class CoolingLoadCalculator:
             latitude: Latitude (e.g., '24N')
             shading_coefficient: Default shading coefficient
             adjusted_shgc: Adjusted SHGC from external drapery calculation (optional)
+            glazing_type: Glazing type (e.g., 'Single Clear', 'Double Tinted') (optional)
+            frame_type: Frame type (e.g., 'Aluminum without Thermal Break') (optional)
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
@@ -770,17 +816,54 @@ 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}")
 
-            # Conduction load
-            cltd = outdoor_temp - indoor_temp
-            conduction_load = skylight.u_value * skylight.area * cltd
+            # Initialize CLTDCalculator
+            cltd_calculator = CLTDCalculator(
+                indoor_temp=indoor_temp,
+                outdoor_max_temp=outdoor_temp,
+                outdoor_daily_range=11.7,  # Default from drapery.py
+                latitude=latitude,
+                month=month
+            )
+
+            # Determine U-factor and SHGC
+            u_value = skylight.u_value
+            shgc = skylight.shgc
+            if glazing_type and frame_type:
+                try:
+                    glazing_enum = next(g for g in GlazingType if g.value == glazing_type)
+                    frame_enum = next(f for f in FrameType if f.value == frame_type)
+                    u_value = SKYLIGHT_U_FACTORS.get((glazing_enum, frame_enum), skylight.u_value)
+                    shgc = SKYLIGHT_SHGC.get((glazing_enum, frame_enum), skylight.shgc)
+                    if self.debug_mode:
+                        logger.debug(f"Using table values: u_value={u_value}, shgc={shgc} for glazing_type={glazing_type}, frame_type={frame_type}")
+                except StopIteration:
+                    if self.debug_mode:
+                        logger.warning(f"Invalid glazing_type={glazing_type} or frame_type={frame_type}. Using default u_value={u_value}, shgc={shgc}")
+
+            # Conduction load using CLTD
+            try:
+                glazing_key = glazing_type if glazing_type in ['Single Clear', 'Double Tinted', 'Low-E', 'Reflective'] else 'SingleClear'
+                cltd = cltd_calculator.get_cltd_skylight(
+                    glazing_type=glazing_key,
+                    hour=hour
+                )
+                if self.debug_mode:
+                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}")
+            except Exception as e:
+                if self.debug_mode:
+                    logger.error(f"get_cltd_skylight failed for glazing_type={glazing_key}: {str(e)}")
+                    logger.warning("Using default CLTD=8.0°C")
+                cltd = 8.0
+
+            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,11 +887,11 @@ 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:
-                logger.debug(f"Skylight load: conduction={conduction_load}, solar={solar_load}, total={total_load}, effective_shading_coefficient={effective_shading_coefficient}")
+                logger.debug(f"Skylight load: conduction={conduction_load}, solar={solar_load}, total={total_load}, u_value={u_value}, shgc={shgc}, cltd={cltd}, effective_shading_coefficient={effective_shading_coefficient}")
 
             return {
                 'conduction': max(conduction_load, 0.0),