Update utils/cooling_load.py

utils/cooling_load.py

@@ -495,30 +495,29 @@ class CoolingLoadCalculator:
             latitude = self.validate_latitude(latitude)
             month = self.validate_month(month)
             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 hasattr(wall, 'wall_group') else 'A'
+            numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'H'}
+            
+            if wall_group in numeric_map:
+                wall_group = numeric_map[wall_group]
+                if self.debug_mode:
+                    logger.info(f"Mapped wall_group {wall.wall_group} to {wall_group}")
+            elif wall_group not in self.valid_wall_groups:
+                if self.debug_mode:
+                    logger.warning(f"Invalid wall group: {wall_group}. Defaulting to 'A'")
+                wall_group = 'A'
     
-            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', '5': 'E', '6': 'F', '7': 'G', '8': 'H'}
-                if wall_group in numeric_map:
-                    wall_group = numeric_map[wall_group]
-                    if self.debug_mode:
-                        logger.info(f"Mapped wall_group {wall.wall_group} to {wall_group}")
-                else:
-                    if self.debug_mode:
-                        logger.warning(f"Invalid wall group: {wall_group}. Defaulting to 'A'")
-                    wall_group = 'A'
+            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
+            
+            if self.debug_mode:
+                logger.debug(f"Calling get_cltd for wall: group={wall_group}, orientation={wall.orientation.value}, hour={hour}, latitude={lat_value}, solar_absorptivity={solar_absorptivity}")
     
             try:
-                # Convert latitude string (e.g., '40N') to float (e.g., 40.0) for get_cltd
-                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
-                # Get CLTD in °F and convert to °C
                 cltd_f = self.ashrae_tables.get_cltd(
                     element_type='wall',
                     group=wall_group,
@@ -530,7 +529,7 @@ class CoolingLoadCalculator:
                 cltd = (cltd_f - 32) * 5 / 9  # Convert °F to °C
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"get_cltd failed for wall_group={wall_group}: {str(e)}")
+                    logger.error(f"get_cltd failed for wall_group={wall_group}, latitude={lat_value}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0
             
@@ -574,30 +573,29 @@ class CoolingLoadCalculator:
             latitude = self.validate_latitude(latitude)
             month = self.validate_month(month)
             hour = self.validate_hour(hour)
+            roof_group = str(roof.roof_group).upper() if hasattr(roof, 'roof_group') else 'A'
+            numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'G'}
+            
+            if roof_group in numeric_map:
+                roof_group = numeric_map[roof_group]  # Fixed: Correctly use roof_group
+                if self.debug_mode:
+                    logger.info(f"Mapped roof_group {roof.roof_group} to {roof_group}")
+            elif roof_group not in self.valid_roof_groups:
+                if self.debug_mode:
+                    logger.warning(f"Invalid roof group: {roof_group}. Defaulting to 'A'")
+                roof_group = 'A'
+            
+            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
+            
             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}")
+                logger.debug(f"Calling get_cltd for roof: group={roof_group}, orientation={roof.orientation.value}, hour={hour}, latitude={lat_value}, 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'}
-                if roof_group in numeric_map:
-                    roof_group = numeric_map[wall_group]
-                    if self.debug_mode:
-                        logger.info(f"Mapped roof_group {roof.roof_group} to {roof_group}")
-                else:
-                    if self.debug_mode:
-                        logger.warning(f"Invalid roof group: {roof_group}. Defaulting to 'A'")
-                    roof_group = 'A'
-            
             try:
-                # Convert latitude string (e.g., '40N') to float (e.g., 40.0) for get_cltd
-                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
-                # Get CLTD in °F and convert to °C
                 cltd_f = self.ashrae_tables.get_cltd(
                     element_type='roof',
                     group=roof_group,
@@ -609,7 +607,7 @@ class CoolingLoadCalculator:
                 cltd = (cltd_f - 32) * 5 / 9  # Convert °F to °C
             except Exception as e:
                 if self.debug_mode:
-                    logger.error(f"get_cltd failed for roof_group={roof_group}: {str(e)}")
+                    logger.error(f"get_cltd failed for roof_group={roof_group}, latitude={lat_value}: {str(e)}")
                     logger.warning("Using default CLTD=8.0°C")
                 cltd = 8.0