Update utils/cooling_load.py

utils/cooling_load.py

@@ -669,6 +669,21 @@ class CoolingLoadCalculator:
         """
         Calculate cooling load for a window (conduction and solar).
         Reference: ASHRAE Handbook—Fundamentals (2017), Chapter 18, Equations 18.12-18.13.
+        
+        Args:
+            window: Window component
+            outdoor_temp: Outdoor temperature (°C)
+            indoor_temp: Indoor temperature (°C)
+            month: Design month (e.g., 'JUL')
+            hour: Hour of the day
+            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') (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
@@ -685,24 +700,12 @@ class CoolingLoadCalculator:
             if self.debug_mode:
                 logger.debug(f"Month converted: {month} -> {month_int}")
     
-            # Convert latitude to numerical value
-            try:
-                lat_value = float(latitude.replace('N', ''))
-                if self.debug_mode:
-                    logger.debug(f"Converted latitude {latitude} to {lat_value} for CLTDCalculator")
-            except ValueError:
-                if self.debug_mode:
-                    logger.error(f"Invalid latitude format: {latitude}. Defaulting to 32.0")
-                lat_value = 32.0
-    
-            # Initialize CLTDCalculator with numerical latitude
-            if self.debug_mode:
-                logger.debug(f"Initializing CLTDCalculator with lat_value={lat_value}")
+            # Initialize CLTDCalculator
             cltd_calculator = CLTDCalculator(
                 indoor_temp=indoor_temp,
                 outdoor_max_temp=outdoor_temp,
                 outdoor_daily_range=11.7,  # Default from drapery.py
-                latitude=lat_value,  # Pass numerical latitude
+                latitude=latitude,
                 month=month_int
             )
     
@@ -724,8 +727,6 @@ class CoolingLoadCalculator:
             # Conduction load using CLTD
             try:
                 glazing_key = glazing_type if glazing_type in ['Single Clear', 'Double Tinted', 'Low-E', 'Reflective'] else 'SingleClear'
-                if self.debug_mode:
-                    logger.debug(f"Calling get_cltd_window with glazing_type={glazing_key}, orientation={window.orientation.value}, hour={hour}")
                 cltd = cltd_calculator.get_cltd_window(
                     glazing_type=glazing_key,
                     orientation=window.orientation.value,
@@ -757,22 +758,19 @@ class CoolingLoadCalculator:
     
             # Solar load with latitude interpolation
             try:
+                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"
     
-                if self.debug_mode:
-                    logger.debug(f"Calling get_scl with lat1_str={lat1_str}, lat2_str={lat2_str}, orientation={window.orientation.value}, hour={hour}, month={month_int}")
                 scl1 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=lat1_str,
+                    latitude=float(lat1),  # Use numerical latitude
                     orientation=window.orientation.value,
                     hour=hour,
                     month=month_int
                 )
                 scl2 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=lat2_str,
+                    latitude=float(lat2),  # Use numerical latitude
                     orientation=window.orientation.value,
                     hour=hour,
                     month=month_int
@@ -849,14 +847,14 @@ class CoolingLoadCalculator:
             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,
@@ -865,7 +863,7 @@ class CoolingLoadCalculator:
                 latitude=latitude,
                 month=month_int
             )
-
+    
             # Determine U-factor and SHGC
             u_value = skylight.u_value
             shgc = skylight.shgc
@@ -880,7 +878,7 @@ class CoolingLoadCalculator:
                 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'
@@ -895,9 +893,9 @@ class CoolingLoadCalculator:
                     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:
@@ -911,29 +909,27 @@ class CoolingLoadCalculator:
             else:
                 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 with latitude interpolation
             try:
                 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,
+                    latitude=float(lat1),  # Use numerical latitude
                     orientation='Horizontal',
                     hour=hour,
                     month=month_int
                 )
                 scl2 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=lat2_str,
+                    latitude=float(lat2),  # Use numerical latitude
                     orientation='Horizontal',
                     hour=hour,
                     month=month_int
                 )
-
+    
                 # Interpolate SCL
                 if lat1 == lat2:
                     scl = scl1
@@ -948,13 +944,13 @@ class CoolingLoadCalculator:
                     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 * 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}, u_value={u_value}, shgc={shgc}, cltd={cltd}, effective_shading_coefficient={effective_shading_coefficient}")
-
+    
             return {
                 'conduction': max(conduction_load, 0.0),
                 'solar': max(solar_load, 0.0),