Update utils/cooling_load.py

utils/cooling_load.py

@@ -29,7 +29,7 @@ class CoolingLoadCalculator:
         self.hours = list(range(24))
         self.valid_latitudes = ['24N', '36N', '48N']
         self.valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-        self.valid_wall_groups = ['A', 'B', 'C', 'D']  # Adjusted to common ASHRAE groups
+        self.valid_wall_groups = ['A', 'B', 'C', 'D']
         self.valid_roof_groups = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
     
     def validate_latitude(self, latitude: Any) -> str:
@@ -46,16 +46,21 @@ class CoolingLoadCalculator:
             if not isinstance(latitude, str):
                 latitude = str(latitude)
             
-            # Remove whitespace and convert to uppercase
             latitude = latitude.strip().upper()
             
+            # Handle concatenated formats like '24N_JUL'
+            if '_' in latitude:
+                parts = latitude.split('_')
+                if len(parts) > 1:
+                    lat_part = parts[0]
+                    logger.warning(f"Detected concatenated input: {latitude}. Using latitude={lat_part}")
+                    latitude = lat_part
+            
             # Handle formats like '31.973N', '1_31.973N'
-            if '_' in latitude or '.' in latitude:
-                # Extract numeric part
+            if '.' in latitude or any(c.isdigit() for c in latitude):
                 num_part = ''.join(c for c in latitude if c.isdigit() or c == '.')
                 try:
                     lat_val = float(num_part)
-                    # Map to closest valid latitude
                     if lat_val <= 30:
                         return '24N'
                     elif lat_val <= 42:
@@ -142,7 +147,7 @@ class CoolingLoadCalculator:
             # Validate inputs
             latitude = self.validate_latitude(outdoor_conditions.get('latitude', '24N'))
             month = self.validate_month(outdoor_conditions.get('month', 'JUL'))
-            logger.debug(f"calculate_hourly_cooling_loads: latitude={latitude}, month={month}")
+            logger.debug(f"calculate_hourly_cooling_loads: latitude={latitude}, month={month}, outdoor_conditions={outdoor_conditions}")
 
             # Calculate loads for walls
             for wall in building_components.get('walls', []):
@@ -384,7 +389,6 @@ class CoolingLoadCalculator:
             # Validate wall_group
             wall_group = str(wall.wall_group).upper()
             if wall_group not in self.valid_wall_groups:
-                # Map numeric groups to letters (e.g., '1' -> 'A')
                 numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D'}
                 if wall_group in numeric_map:
                     wall_group = numeric_map[wall_group]
@@ -407,7 +411,7 @@ class CoolingLoadCalculator:
             except Exception as e:
                 logger.error(f"calculate_corrected_cltd_wall failed for wall_group={wall_group}: {str(e)}")
                 logger.warning("Using default CLTD=10.0°C")
-                cltd = 10.0  # Conservative fallback
+                cltd = 10.0
             
             load = wall.u_value * wall.area * cltd
             logger.debug(f"Wall load: u_value={wall.u_value}, area={wall.area}, cltd={cltd}, load={load}")
@@ -445,7 +449,6 @@ class CoolingLoadCalculator:
             month = self.validate_month(month)
             logger.debug(f"calculate_roof_cooling_load: latitude={latitude}, month={month}, roof_group={roof.roof_group}")
 
-            # Validate and map roof_group
             roof_group = str(roof.roof_group).upper()
             if roof_group not in self.valid_roof_groups:
                 logger.warning(f"Invalid roof group: {roof_group}. Defaulting to 'A'")
@@ -464,7 +467,7 @@ class CoolingLoadCalculator:
             except Exception as e:
                 logger.error(f"calculate_corrected_cltd_roof failed for roof_group={roof_group}: {str(e)}")
                 logger.warning("Using default CLTD=10.0°C")
-                cltd = 10.0  # Conservative fallback
+                cltd = 10.0
             
             load = roof.u_value * roof.area * cltd
             logger.debug(f"Roof load: u_value={roof.u_value}, area={roof.area}, cltd={cltd}, load={load}")
@@ -502,7 +505,7 @@ class CoolingLoadCalculator:
         try:
             scl_latitude = self.validate_latitude(latitude)
             month_upper = self.validate_month(month)
-            logger.debug(f"calculate_window_cooling_load: latitude={scl_latitude}, month={month_upper}, orientation={window.orientation.value}")
+            logger.debug(f"calculate_window_cooling_load: latitude={latitude} -> {scl_latitude}, month={month} -> {month_upper}, orientation={window.orientation.value}")
 
             # Conduction load
             delta_t = outdoor_temp - indoor_temp
@@ -511,18 +514,17 @@ class CoolingLoadCalculator:
             # Solar load
             logger.debug(f"Calling get_scl with month={month_upper}, orientation={window.orientation.value}, hour={hour}, latitude={scl_latitude}")
             
-            # Try different month formats to handle potential get_scl issues
             month_formats = [
-                (month_upper, "uppercase"),  # e.g., 'JUL'
-                (month_upper.capitalize(), "capitalized"),  # e.g., 'Jul'
+                (month_upper, "uppercase"),
+                (month_upper.capitalize(), "capitalized"),
                 (str({'JAN': 1, 'FEB': 2, 'MAR': 3, 'APR': 4, 'MAY': 5, 'JUN': 6,
-                      'JUL': 7, 'AUG': 8, 'SEP': 9, 'OCT': 10, 'NOV': 11, 'DEC': 12}[month_upper]), "numeric")  # e.g., '7'
+                      'JUL': 7, 'AUG': 8, 'SEP': 9, 'OCT': 10, 'NOV': 11, 'DEC': 12}[month_upper]), "numeric")
             ]
             
             scl = None
             for month_value, format_name in month_formats:
                 try:
-                    logger.debug(f"Trying get_scl with month format '{format_name}': month={month_value}")
+                    logger.debug(f"Trying get_scl with month format '{format_name}': month={month_value}, latitude={scl_latitude}")
                     scl = self.ashrae_tables.get_scl(
                         latitude=scl_latitude,
                         month=month_value,
@@ -535,15 +537,19 @@ class CoolingLoadCalculator:
                     logger.warning(f"get_scl failed with month format '{format_name}': {str(e)}")
                     continue
             
-            # Final fallback: Use latitude='24N' with default month='JUL'
             if scl is None:
                 logger.warning(f"All month formats failed. Retrying with fallback latitude='24N', month='JUL'")
-                scl = self.ashrae_tables.get_scl(
-                    latitude='24N',
-                    month='JUL',
-                    orientation=window.orientation.value,
-                    hour=hour
-                )
+                try:
+                    scl = self.ashrae_tables.get_scl(
+                        latitude='24N',
+                        month='JUL',
+                        orientation=window.orientation.value,
+                        hour=hour
+                    )
+                except Exception as e:
+                    logger.error(f"Fallback get_scl failed: {str(e)}")
+                    logger.warning("Using default SCL=100 W/m²")
+                    scl = 100.0  # Conservative fallback
             
             solar_load = window.area * window.shgc * scl * shading_coefficient
             
@@ -751,10 +757,9 @@ class CoolingLoadCalculator:
             air_changes_per_hour = (flow_rate * 3600) / building_volume
             sensible_load = 1.2 * flow_rate * 1000 * (outdoor_temp - indoor_temp)
             
-            # Calculate humidity ratio difference
             logger.debug(f"Calculating outdoor humidity ratio: temp={outdoor_temp}°C, rh={outdoor_rh}%")
             try:
-                outdoor_rh = min(max(outdoor_rh, 0), 100)  # Clamp RH to 0-100
+                outdoor_rh = min(max(outdoor_rh, 0), 100)
                 outdoor_w = self.heat_transfer.psychrometrics.humidity_ratio(outdoor_temp, outdoor_rh)
             except Exception as e:
                 logger.error(f"Failed to calculate outdoor humidity ratio: {str(e)}")
@@ -763,7 +768,7 @@ class CoolingLoadCalculator:
             
             logger.debug(f"Calculating indoor humidity ratio: temp={indoor_temp}°C, rh={indoor_rh}%")
             try:
-                indoor_rh = min(max(indoor_rh, 0), 100)  # Clamp RH to 0-100
+                indoor_rh = min(max(indoor_rh, 0), 100)
                 indoor_w = self.heat_transfer.psychrometrics.humidity_ratio(indoor_temp, indoor_rh)
             except Exception as e:
                 logger.error(f"Failed to calculate indoor humidity ratio: {str(e)}")
@@ -811,10 +816,9 @@ class CoolingLoadCalculator:
             
             sensible_load = 1.2 * flow_rate * 1000 * (outdoor_temp - indoor_temp)
             
-            # Calculate humidity ratio difference
             logger.debug(f"Calculating outdoor humidity ratio: temp={outdoor_temp}°C, rh={outdoor_rh}%")
             try:
-                outdoor_rh = min(max(outdoor_rh, 0), 100)  # Clamp RH to 0-100
+                outdoor_rh = min(max(outdoor_rh, 0), 100)
                 outdoor_w = self.heat_transfer.psychrometrics.humidity_ratio(outdoor_temp, outdoor_rh)
             except Exception as e:
                 logger.error(f"Failed to calculate outdoor humidity ratio: {str(e)}")
@@ -823,7 +827,7 @@ class CoolingLoadCalculator:
             
             logger.debug(f"Calculating indoor humidity ratio: temp={indoor_temp}°C, rh={indoor_rh}%")
             try:
-                indoor_rh = min(max(indoor_rh, 0), 100)  # Clamp RH to 0-100
+                indoor_rh = min(max(indoor_rh, 0), 100)
                 indoor_w = self.heat_transfer.psychrometrics.humidity_ratio(indoor_temp, indoor_rh)
             except Exception as e:
                 logger.error(f"Failed to calculate indoor humidity ratio: {str(e)}")
@@ -845,17 +849,15 @@ class CoolingLoadCalculator:
 
 
 if __name__ == "__main__":
-    # Example usage for testing
     calculator = CoolingLoadCalculator()
     
-    # Dummy inputs
     building_components = {
         'walls': [Wall(
             name="North Wall",
             orientation=Orientation.NORTH,
             area=20.0,
             u_value=0.5,
-            wall_group="1"  # Will be mapped to 'A'
+            wall_group="1"
         )],
         'roofs': [Roof(
             name="Main Roof",
@@ -905,13 +907,12 @@ if __name__ == "__main__":
 
     building_volume = 300.0
 
-    # Test with multiple latitudes, months, and wall groups
     test_cases = [
         {'latitude': '24N', 'month': 'Jul', 'wall_group': 'A'},
         {'latitude': '36N', 'month': 'Jul', 'wall_group': 'B'},
-        {'latitude': '48N', 'month': 'Jan', 'wall_group': '1'},  # Should map to 'A'
-        {'latitude': '1_31.973N', 'month': 'Jul', 'wall_group': 'invalid'},  # Should default to 'A'
-        {'latitude': 'invalid', 'month': 'invalid', 'wall_group': '2'}  # Should map to 'B'
+        {'latitude': '48N', 'month': 'Jan', 'wall_group': '1'},
+        {'latitude': '24N_JUL', 'month': 'Jul', 'wall_group': 'invalid'},
+        {'latitude': 'invalid', 'month': 'invalid', 'wall_group': '2'}
     ]
 
     for case in test_cases: