Update utils/cooling_load.py

utils/cooling_load.py

@@ -700,12 +700,20 @@ class CoolingLoadCalculator:
             if self.debug_mode:
                 logger.debug(f"Month converted: {month} -> {month_int}")
     
-            # Initialize CLTDCalculator
+            # Convert string latitude to numerical for CLTDCalculator and CLTD calculations
+            try:
+                lat_value = float(latitude.replace('N', ''))
+            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
             cltd_calculator = CLTDCalculator(
                 indoor_temp=indoor_temp,
                 outdoor_max_temp=outdoor_temp,
                 outdoor_daily_range=11.7,  # Default from drapery.py
-                latitude=latitude,
+                latitude=lat_value,  # Use numerical latitude
                 month=month_int
             )
     
@@ -730,13 +738,14 @@ class CoolingLoadCalculator:
                 cltd = cltd_calculator.get_cltd_window(
                     glazing_type=glazing_key,
                     orientation=window.orientation.value,
-                    hour=hour
+                    hour=hour,
+                    latitude=lat_value  # Pass numerical latitude
                 )
                 if self.debug_mode:
-                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}")
+                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}, latitude={lat_value}")
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"get_cltd_window failed for glazing_type={glazing_key}: {str(e)}")
+                    logger.error(f"get_cltd_window failed for glazing_type={glazing_key}, latitude={lat_value}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0
     
@@ -758,19 +767,18 @@ 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)
     
                 scl1 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=float(lat1),  # Use numerical latitude
+                    latitude=float(lat1),
                     orientation=window.orientation.value,
                     hour=hour,
                     month=month_int
                 )
                 scl2 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=float(lat2),  # Use numerical latitude
+                    latitude=float(lat2),
                     orientation=window.orientation.value,
                     hour=hour,
                     month=month_int
@@ -787,7 +795,7 @@ class CoolingLoadCalculator:
                     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)}")
+                    logger.error(f"get_scl failed for latitude={lat_value}, month={month}, orientation={window.orientation.value}: {str(e)}")
                     logger.warning("Using default SCL=100 W/m²")
                 scl = 100.0
     
@@ -855,12 +863,20 @@ class CoolingLoadCalculator:
             if self.debug_mode:
                 logger.debug(f"Month converted: {month} -> {month_int}")
     
-            # Initialize CLTDCalculator
+            # Convert string latitude to numerical for CLTDCalculator and CLTD calculations
+            try:
+                lat_value = float(latitude.replace('N', ''))
+            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
             cltd_calculator = CLTDCalculator(
                 indoor_temp=indoor_temp,
                 outdoor_max_temp=outdoor_temp,
                 outdoor_daily_range=11.7,  # Default from drapery.py
-                latitude=latitude,
+                latitude=lat_value,  # Use numerical latitude
                 month=month_int
             )
     
@@ -884,13 +900,14 @@ class CoolingLoadCalculator:
                 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
+                    hour=hour,
+                    latitude=lat_value  # Pass numerical latitude
                 )
                 if self.debug_mode:
-                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}")
+                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}, latitude={lat_value}")
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"get_cltd_skylight failed for glazing_type={glazing_key}: {str(e)}")
+                    logger.error(f"get_cltd_skylight failed for glazing_type={glazing_key}, latitude={lat_value}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0
     
@@ -912,19 +929,18 @@ 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)
     
                 scl1 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=float(lat1),  # Use numerical latitude
+                    latitude=float(lat1),
                     orientation='Horizontal',
                     hour=hour,
                     month=month_int
                 )
                 scl2 = cltd_calculator.ashrae_tables.get_scl(
-                    latitude=float(lat2),  # Use numerical latitude
+                    latitude=float(lat2),
                     orientation='Horizontal',
                     hour=hour,
                     month=month_int
@@ -941,7 +957,7 @@ class CoolingLoadCalculator:
                     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)}")
+                    logger.error(f"get_scl failed for latitude={lat_value}, month={month}, orientation=Horizontal: {str(e)}")
                     logger.warning("Using default SCL=100 W/m²")
                 scl = 100.0