Update utils/cooling_load.py

utils/cooling_load.py

@@ -15,6 +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, Orientation
+from drapery import Drapery
 
 # Set up logging
 logging.basicConfig(level=logging.INFO)
@@ -496,7 +497,7 @@ class CoolingLoadCalculator:
             month = self.validate_month(month)
             hour = self.validate_hour(hour)
             wall_group = str(wall.wall_group).upper() if hasattr(wall, 'wall_group') else 'A'
-            numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'H'}
+            numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': Jeanette 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'H'}
             
             if wall_group in numeric_map:
                 wall_group = numeric_map[wall_group]
@@ -646,7 +647,7 @@ class CoolingLoadCalculator:
             month: Design month
             hour: Hour of the day
             latitude: Latitude (e.g., '24N')
-            shading_coefficient: Shading coefficient
+            shading_coefficient: Default shading coefficient
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
@@ -662,6 +663,20 @@ 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}")
+
             # Solar load
             try:
                 scl = self.ashrae_tables.get_scl(
@@ -676,11 +691,11 @@ class CoolingLoadCalculator:
                     logger.warning("Using default SCL=100 W/m²")
                 scl = 100.0
 
-            solar_load = window.area * window.shgc * shading_coefficient * scl
+            solar_load = window.area * window.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}")
+                logger.debug(f"Window load: conduction={conduction_load}, solar={solar_load}, total={total_load}, effective_shading_coefficient={effective_shading_coefficient}")
 
             return {
                 'conduction': max(conduction_load, 0.0),