Update utils/cooling_load.py

utils/cooling_load.py

@@ -37,7 +37,7 @@ class CoolingLoadCalculator:
         self.hours = list(range(24))
         self.valid_latitudes = ['24N', '32N', '40N', '48N', '56N']
         self.valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-        self.valid_wall_groups = ['A', 'B', 'C', 'D']
+        self.valid_wall_groups = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
         self.valid_roof_groups = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
         self.debug_mode = debug_mode
         if debug_mode:
@@ -500,7 +500,7 @@ class CoolingLoadCalculator:
     
             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'}
+                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:
@@ -511,8 +511,13 @@ class CoolingLoadCalculator:
                     wall_group = 'A'
     
             try:
-                # Convert latitude string (e.g., '40N') to float (e.g., 40.0)
-                lat_value = float(latitude.replace('N', ''))
+                # 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',
@@ -576,7 +581,7 @@ class CoolingLoadCalculator:
             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[roof_group]
+                    roof_group = numeric_map[wall_group]
                     if self.debug_mode:
                         logger.info(f"Mapped roof_group {roof.roof_group} to {roof_group}")
                 else:
@@ -585,8 +590,13 @@ class CoolingLoadCalculator:
                     roof_group = 'A'
             
             try:
-                # Convert latitude string (e.g., '40N') to float (e.g., 40.0)
-                lat_value = float(latitude.replace('N', ''))
+                # 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',