Update utils/cooling_load.py

utils/cooling_load.py

@@ -63,6 +63,25 @@ class CoolingLoadCalculator:
         }
         
         try:
+            # Validate outdoor conditions
+            valid_latitudes = ['24N', '36N', '48N']
+            latitude = outdoor_conditions.get('latitude', '24N')
+            if not isinstance(latitude, str) or '_' in latitude:
+                raise ValueError(f"Invalid latitude format: {latitude}. Expected format: '24N', '36N', or '48N'")
+            if latitude not in valid_latitudes:
+                try:
+                    lat_value = float(latitude[:-1])
+                    differences = [abs(lat_value - float(lat[:-1])) for lat in valid_latitudes]
+                    nearest_idx = differences.index(min(differences))
+                    latitude = valid_latitudes[nearest_idx]
+                except ValueError:
+                    latitude = '24N'  # Default to '24N' if parsing fails
+
+            valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
+            month = outdoor_conditions.get('month', 'JUL').upper()
+            if month not in valid_months:
+                raise ValueError(f"Invalid month: {month}. Must be one of {valid_months}")
+
             # Calculate loads for walls
             for wall in building_components.get('walls', []):
                 for hour in range(24):
@@ -70,9 +89,9 @@ class CoolingLoadCalculator:
                         wall=wall,
                         outdoor_temp=outdoor_conditions['temperature'],
                         indoor_temp=indoor_conditions['temperature'],
-                        month=outdoor_conditions['month'],
+                        month=month,
                         hour=hour,
-                        latitude=outdoor_conditions['latitude']
+                        latitude=latitude
                     )
                     hourly_loads['walls'][hour + 1] += load
             
@@ -83,9 +102,9 @@ class CoolingLoadCalculator:
                         roof=roof,
                         outdoor_temp=outdoor_conditions['temperature'],
                         indoor_temp=indoor_conditions['temperature'],
-                        month=outdoor_conditions['month'],
+                        month=month,
                         hour=hour,
-                        latitude=outdoor_conditions['latitude']
+                        latitude=latitude
                     )
                     hourly_loads['roofs'][hour + 1] += load
             
@@ -96,9 +115,9 @@ class CoolingLoadCalculator:
                         window=window,
                         outdoor_temp=outdoor_conditions['temperature'],
                         indoor_temp=indoor_conditions['temperature'],
-                        month=outdoor_conditions['month'],
+                        month=month,
                         hour=hour,
-                        latitude=outdoor_conditions['latitude'],
+                        latitude=latitude,
                         shading_coefficient=window.shading_coefficient
                     )
                     hourly_loads['windows_conduction'][hour + 1] += load_dict['conduction']
@@ -394,7 +413,7 @@ class CoolingLoadCalculator:
             indoor_temp: Indoor temperature (°C)
             month: Design month (e.g., 'Jan', 'Jul')
             hour: Hour of the day
-            latitude: Latitude (e.g., '40N')
+            latitude: Latitude (e.g., '24N', '36N', '48N')
             shading_coefficient: Shading coefficient for drapery
             
         Returns:
@@ -407,13 +426,11 @@ class CoolingLoadCalculator:
             if month_upper not in valid_months:
                 raise ValueError(f"Invalid month: {month}. Must be one of {valid_months}")
 
-            # Conduction load
-            delta_t = outdoor_temp - indoor_temp
-            conduction_load = window.u_value * window.area * delta_t
-            
-            # Validate and map latitude for SCL
+            # Validate latitude
             valid_latitudes = ['24N', '36N', '48N']
             scl_latitude = latitude
+            if not isinstance(latitude, str) or '_' in latitude:
+                raise ValueError(f"Invalid latitude format: {latitude}. Expected format: '24N', '36N', or '48N'")
             if latitude not in valid_latitudes:
                 try:
                     lat_value = float(latitude[:-1])
@@ -422,16 +439,23 @@ class CoolingLoadCalculator:
                     scl_latitude = valid_latitudes[nearest_idx]
                 except ValueError:
                     scl_latitude = '24N'  # Default to '24N' if parsing fails
+
+            # Conduction load
+            delta_t = outdoor_temp - indoor_temp
+            conduction_load = window.u_value * window.area * delta_t
             
             # Solar load
             # Note: Solar altitude is not computed directly, as ASHRAE SCL tables (via get_scl)
             # account for solar geometry effects based on month, orientation, hour, and latitude.
-            scl = self.ashrae_tables.get_scl(
-                month=month_upper,
-                orientation=window.orientation.value,
-                hour=hour,
-                latitude=scl_latitude
-            )
+            try:
+                scl = self.ashrae_tables.get_scl(
+                    month=month_upper,
+                    orientation=window.orientation.value,
+                    hour=hour,
+                    latitude=scl_latitude
+                )
+            except Exception as e:
+                raise ValueError(f"Failed to retrieve SCL for month={month_upper}, orientation={window.orientation.value}, hour={hour}, latitude={scl_latitude}: {str(e)}")
             
             solar_load = window.area * window.shgc * scl * shading_coefficient
             
@@ -699,4 +723,32 @@ if __name__ == "__main__":
         'month': 'Jul',
         'latitude': '24N',
         'wind_speed': 4
-    }
+    }
+
+    indoor_conditions = {
+        'temperature': 24.0,
+        'relative_humidity': 50.0
+    }
+
+    internal_loads = {
+        'people': {'number': 10, 'activity_level': 'Seated/Resting'},
+        'lights': {'power': 1000, 'use_factor': 0.8, 'special_allowance': 1.0},
+        'equipment': {'power': 500, 'use_factor': 0.7, 'radiation_factor': 0.5},
+        'infiltration': {'flow_rate': 0.01},
+        'ventilation': {'flow_rate': 0.02}
+    }
+
+    building_volume = 300.0
+
+    # Calculate loads
+    try:
+        hourly_loads = calculator.calculate_hourly_cooling_loads(
+            building_components,
+            outdoor_conditions,
+            indoor_conditions,
+            internal_loads,
+            building_volume
+        )
+        print("Hourly Loads:", hourly_loads)
+    except Exception as e:
+        print(f"Error in example calculation: {str(e)}")