Update utils/cooling_load.py

utils/cooling_load.py

@@ -674,31 +674,39 @@ class CoolingLoadCalculator:
             window: Window component
             outdoor_temp: Outdoor temperature (°C)
             indoor_temp: Indoor temperature (°C)
-            month: Design month
+            month: Design month (e.g., 'JUL')
             hour: Hour of the day
-            latitude: Latitude (e.g., '24N')
+            latitude: Latitude (e.g., '40N')
             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)
+            glazing_type: Glazing type (e.g., 'Single Clear') (optional)
             frame_type: Frame type (e.g., 'Aluminum without Thermal Break') (optional)
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
         """
         try:
+            # Validate inputs
             latitude = self.validate_latitude(latitude)
             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}, glazing_type={glazing_type}, frame_type={frame_type}")
 
+            # Convert month string to integer for CLTDCalculator
+            month_map = {'JAN': 1, 'FEB': 2, 'MAR': 3, 'APR': 4, 'MAY': 5, 'JUN': 6,
+                         'JUL': 7, 'AUG': 8, 'SEP': 9, 'OCT': 10, 'NOV': 11, 'DEC': 12}
+            month_int = month_map.get(month.upper(), 7)  # Default to July
+            if self.debug_mode:
+                logger.debug(f"Month converted: {month} -> {month_int}")
+
             # 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
+                month=month_int
             )
 
             # Determine U-factor and SHGC
@@ -748,14 +756,37 @@ class CoolingLoadCalculator:
                 if self.debug_mode:
                     logger.debug(f"Using shading coefficient: {effective_shading_coefficient} (adjusted_shgc={adjusted_shgc}, drapery={'enabled' if hasattr(window, 'drapery') and window.drapery and window.drapery.enabled else 'disabled'})")
 
-            # Solar load
+            # Solar load with latitude interpolation
             try:
-                scl = self.ashrae_tables.get_scl(
-                    latitude=latitude,
-                    month=month,
+                lat_value = float(latitude.replace('N', ''))
+                latitudes = [24, 32, 40, 48, 56]
+                lat1 = max([lat for lat in latitudes if lat <= lat_value], default=24)
+                lat2 = min([lat for lat in latitudes if lat >= lat_value], default=56)
+                lat1_str = f"{lat1}N"
+                lat2_str = f"{lat2}N"
+
+                scl1 = cltd_calculator.ashrae_tables.get_scl(
+                    latitude=lat1_str,
                     orientation=window.orientation.value,
-                    hour=hour
+                    hour=hour,
+                    month=month_int
+                )
+                scl2 = cltd_calculator.ashrae_tables.get_scl(
+                    latitude=lat2_str,
+                    orientation=window.orientation.value,
+                    hour=hour,
+                    month=month_int
                 )
+
+                # Interpolate SCL
+                if lat1 == lat2:
+                    scl = scl1
+                else:
+                    weight = (lat_value - lat1) / (lat2 - lat1)
+                    scl = scl1 + weight * (scl2 - scl1)
+                
+                if self.debug_mode:
+                    logger.debug(f"SCL interpolated: scl1={scl1}, scl2={scl2}, lat1={lat1}, lat2={lat2}, weight={weight}, scl={scl}")
             except Exception as e:
                 if self.debug_mode:
                     logger.error(f"get_scl failed for latitude={latitude}, month={month}, orientation={window.orientation.value}: {str(e)}")
@@ -800,31 +831,39 @@ class CoolingLoadCalculator:
             skylight: Skylight component
             outdoor_temp: Outdoor temperature (°C)
             indoor_temp: Indoor temperature (°C)
-            month: Design month
+            month: Design month (e.g., 'JUL')
             hour: Hour of the day
-            latitude: Latitude (e.g., '24N')
+            latitude: Latitude (e.g., '40N')
             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)
+            glazing_type: Glazing type (e.g., 'Single Clear') (optional)
             frame_type: Frame type (e.g., 'Aluminum without Thermal Break') (optional)
             
         Returns:
             Dictionary with conduction, solar, and total loads in Watts
         """
         try:
+            # Validate inputs
             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, glazing_type={glazing_type}, frame_type={frame_type}")
 
+            # Convert month string to integer for CLTDCalculator
+            month_map = {'JAN': 1, 'FEB': 2, 'MAR': 3, 'APR': 4, 'MAY': 5, 'JUN': 6,
+                         'JUL': 7, 'AUG': 8, 'SEP': 9, 'OCT': 10, 'NOV': 11, 'DEC': 12}
+            month_int = month_map.get(month.upper(), 7)  # Default to July
+            if self.debug_mode:
+                logger.debug(f"Month converted: {month} -> {month_int}")
+
             # 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
+                month=month_int
             )
 
             # Determine U-factor and SHGC
@@ -873,14 +912,37 @@ class CoolingLoadCalculator:
                 if self.debug_mode:
                     logger.debug(f"Using shading coefficient: {effective_shading_coefficient} (adjusted_shgc={adjusted_shgc}, drapery={'enabled' if hasattr(skylight, 'drapery') and skylight.drapery and skylight.drapery.enabled else 'disabled'})")
 
-            # Solar load
+            # Solar load with latitude interpolation
             try:
-                scl = self.ashrae_tables.get_scl(
-                    latitude=latitude,
-                    month=month,
+                lat_value = float(latitude.replace('N', ''))
+                latitudes = [24, 32, 40, 48, 56]
+                lat1 = max([lat for lat in latitudes if lat <= lat_value], default=24)
+                lat2 = min([lat for lat in latitudes if lat >= lat_value], default=56)
+                lat1_str = f"{lat1}N"
+                lat2_str = f"{lat2}N"
+
+                scl1 = cltd_calculator.ashrae_tables.get_scl(
+                    latitude=lat1_str,
                     orientation='Horizontal',
-                    hour=hour
+                    hour=hour,
+                    month=month_int
+                )
+                scl2 = cltd_calculator.ashrae_tables.get_scl(
+                    latitude=lat2_str,
+                    orientation='Horizontal',
+                    hour=hour,
+                    month=month_int
                 )
+
+                # Interpolate SCL
+                if lat1 == lat2:
+                    scl = scl1
+                else:
+                    weight = (lat_value - lat1) / (lat2 - lat1)
+                    scl = scl1 + weight * (scl2 - scl1)
+                
+                if self.debug_mode:
+                    logger.debug(f"SCL interpolated: scl1={scl1}, scl2={scl2}, lat1={lat1}, lat2={lat2}, weight={weight}, scl={scl}")
             except Exception as e:
                 if self.debug_mode:
                     logger.error(f"get_scl failed for latitude={latitude}, month={month}, orientation=Horizontal: {str(e)}")