Update utils/cooling_load.py

utils/cooling_load.py

@@ -700,7 +700,7 @@ class CoolingLoadCalculator:
             if self.debug_mode:
                 logger.debug(f"Month converted: {month} -> {month_int}")
     
-            # Convert string latitude to numerical for CLTDCalculator and CLTD calculations
+            # Convert string latitude to numerical for SCL interpolation only
             try:
                 lat_value = float(latitude.replace('N', ''))
             except ValueError:
@@ -708,12 +708,12 @@ class CoolingLoadCalculator:
                     logger.error(f"Invalid latitude format: {latitude}. Defaulting to 32.0")
                 lat_value = 32.0
     
-            # Initialize CLTDCalculator with numerical latitude
+            # Initialize CLTDCalculator with string latitude
             cltd_calculator = CLTDCalculator(
                 indoor_temp=indoor_temp,
                 outdoor_max_temp=outdoor_temp,
                 outdoor_daily_range=11.7,  # Default from drapery.py
-                latitude=lat_value,  # Use numerical latitude
+                latitude=latitude,  # Use string latitude
                 month=month_int
             )
     
@@ -738,14 +738,13 @@ class CoolingLoadCalculator:
                 cltd = cltd_calculator.get_cltd_window(
                     glazing_type=glazing_key,
                     orientation=window.orientation.value,
-                    hour=hour,
-                    latitude=lat_value  # Pass numerical latitude
+                    hour=hour
                 )
                 if self.debug_mode:
-                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}, latitude={lat_value}")
+                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}, latitude={latitude}")
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"get_cltd_window failed for glazing_type={glazing_key}, latitude={lat_value}: {str(e)}")
+                    logger.error(f"get_cltd_window failed for glazing_type={glazing_key}, latitude={latitude}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0
     
@@ -765,7 +764,7 @@ 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 with latitude interpolation
+            # Solar load with latitude Interpolation
             try:
                 latitudes = [24, 32, 40, 48, 56]
                 lat1 = max([lat for lat in latitudes if lat <= lat_value], default=24)
@@ -863,7 +862,7 @@ class CoolingLoadCalculator:
             if self.debug_mode:
                 logger.debug(f"Month converted: {month} -> {month_int}")
     
-            # Convert string latitude to numerical for CLTDCalculator and CLTD calculations
+            # Convert string latitude to numerical for SCL interpolation only
             try:
                 lat_value = float(latitude.replace('N', ''))
             except ValueError:
@@ -871,12 +870,12 @@ class CoolingLoadCalculator:
                     logger.error(f"Invalid latitude format: {latitude}. Defaulting to 32.0")
                 lat_value = 32.0
     
-            # Initialize CLTDCalculator with numerical latitude
+            # Initialize CLTDCalculator with string latitude
             cltd_calculator = CLTDCalculator(
                 indoor_temp=indoor_temp,
                 outdoor_max_temp=outdoor_temp,
                 outdoor_daily_range=11.7,  # Default from drapery.py
-                latitude=lat_value,  # Use numerical latitude
+                latitude=latitude,  # Use string latitude
                 month=month_int
             )
     
@@ -900,14 +899,13 @@ 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,
-                    latitude=lat_value  # Pass numerical latitude
+                    hour=hour
                 )
                 if self.debug_mode:
-                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}, latitude={lat_value}")
+                    logger.debug(f"CLTD from CLTDCalculator: {cltd} for glazing_type={glazing_key}, latitude={latitude}")
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"get_cltd_skylight failed for glazing_type={glazing_key}, latitude={lat_value}: {str(e)}")
+                    logger.error(f"get_cltd_skylight failed for glazing_type={glazing_key}, latitude={latitude}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0