Update utils/cooling_load.py

utils/cooling_load.py

@@ -497,7 +497,7 @@ class CoolingLoadCalculator:
             hour = self.validate_hour(hour)
             if self.debug_mode:
                 logger.debug(f"calculate_wall_cooling_load: latitude={latitude}, month={month}, hour={hour}, wall_group={wall.wall_group}, orientation={wall.orientation.value}, solar_absorptivity={solar_absorptivity}")
-
+    
             wall_group = str(wall.wall_group).upper()
             if wall_group not in self.valid_wall_groups:
                 numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D'}
@@ -509,21 +509,23 @@ class CoolingLoadCalculator:
                     if self.debug_mode:
                         logger.warning(f"Invalid wall group: {wall_group}. Defaulting to 'A'")
                     wall_group = 'A'
-
+    
             try:
-                cltd = self.ashrae_tables.calculate_corrected_cltd_wall(
-                    wall_group=wall_group,
+                # Convert latitude string (e.g., '40N') to float (e.g., 40.0)
+                lat_value = float(latitude.replace('N', ''))
+                # Get CLTD in °F and convert to °C
+                cltd_f = self.ashrae_tables.get_cltd(
+                    element_type='wall',
+                    group=wall_group,
                     orientation=wall.orientation.value,
                     hour=hour,
-                    month=month,
-                    latitude=latitude,
-                    indoor_temp=indoor_temp,
-                    outdoor_temp=outdoor_temp,
+                    latitude=lat_value,
                     solar_absorptivity=solar_absorptivity
                 )
+                cltd = (cltd_f - 32) * 5 / 9  # Convert °F to °C
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"calculate_corrected_cltd_wall failed for wall_group={wall_group}: {str(e)}")
+                    logger.error(f"get_cltd failed for wall_group={wall_group}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0
             
@@ -569,7 +571,7 @@ class CoolingLoadCalculator:
             hour = self.validate_hour(hour)
             if self.debug_mode:
                 logger.debug(f"calculate_roof_cooling_load: latitude={latitude}, month={month}, hour={hour}, roof_group={roof.roof_group}, solar_absorptivity={solar_absorptivity}")
-
+    
             roof_group = str(roof.roof_group).upper()
             if roof_group not in self.valid_roof_groups:
                 numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'G'}
@@ -583,18 +585,21 @@ class CoolingLoadCalculator:
                     roof_group = 'A'
             
             try:
-                cltd = self.ashrae_tables.calculate_corrected_cltd_roof(
-                    roof_group=roof_group,
+                # Convert latitude string (e.g., '40N') to float (e.g., 40.0)
+                lat_value = float(latitude.replace('N', ''))
+                # Get CLTD in °F and convert to °C
+                cltd_f = self.ashrae_tables.get_cltd(
+                    element_type='roof',
+                    group=roof_group,
+                    orientation=roof.orientation.value,
                     hour=hour,
-                    month=month,
-                    latitude=latitude,
-                    indoor_temp=indoor_temp,
-                    outdoor_temp=outdoor_temp,
+                    latitude=lat_value,
                     solar_absorptivity=solar_absorptivity
                 )
+                cltd = (cltd_f - 32) * 5 / 9  # Convert °F to °C
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"calculate_corrected_cltd_roof failed for roof_group={roof_group}: {str(e)}")
+                    logger.error(f"get_cltd failed for roof_group={roof_group}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0