Update utils/cooling_load.py

utils/cooling_load.py

@@ -25,152 +25,152 @@ class CoolingLoadCalculator:
         self.hours = list(range(24))
     
     def calculate_hourly_cooling_loads(
-    self,
-    building_components: Dict[str, List[Any]],
-    outdoor_conditions: Dict[str, Any],
-    indoor_conditions: Dict[str, Any],
-    internal_loads: Dict[str, Any],
-    building_volume: float
-) -> Dict[str, Any]:
-    """
-    Calculate hourly cooling loads for all components.
-    
-    Args:
-        building_components: Dictionary of building components
-        outdoor_conditions: Outdoor weather conditions
-        indoor_conditions: Indoor design conditions
-        internal_loads: Internal heat gains
-        building_volume: Building volume in cubic meters
+        self,
+        building_components: Dict[str, List[Any]],
+        outdoor_conditions: Dict[str, Any],
+        indoor_conditions: Dict[str, Any],
+        internal_loads: Dict[str, Any],
+        building_volume: float
+    ) -> Dict[str, Any]:
+        """
+        Calculate hourly cooling loads for all components.
         
-    Returns:
-        Dictionary containing hourly cooling loads
-    """
-    hourly_loads = {
-        'walls': {h: 0.0 for h in range(1, 25)},
-        'roofs': {h: 0.0 for h in range(1, 25)},
-        'windows_conduction': {h: 0.0 for h in range(1, 25)},
-        'windows_solar': {h: 0.0 for h in range(1, 25)},
-        'doors': {h: 0.0 for h in range(1, 25)},
-        'people_sensible': {h: 0.0 for h in range(1, 25)},
-        'people_latent': {h: 0.0 for h in range(1, 25)},
-        'lights': {h: 0.0 for h in range(1, 25)},
-        'equipment_sensible': {h: 0.0 for h in range(1, 25)},
-        'equipment_latent': {h: 0.0 for h in range(1, 25)},
-        'infiltration_sensible': {h: 0.0 for h in range(1, 25)},
-        'infiltration_latent': {h: 0.0 for h in range(1, 25)},
-        'ventilation_sensible': {h: 0.0 for h in range(1, 25)},
-        'ventilation_latent': {h: 0.0 for h in range(1, 25)}
-    }
-    
-    try:
-        # Calculate loads for walls
-        for wall in building_components.get('walls', []):
-            for hour in range(24):
-                load = self.calculate_wall_cooling_load(
-                    wall=wall,
-                    outdoor_temp=outdoor_conditions['temperature'],
-                    indoor_temp=indoor_conditions['temperature'],
-                    month=outdoor_conditions['month'],
-                    hour=hour,
-                    latitude=outdoor_conditions['latitude']
-                )
-                hourly_loads['walls'][hour + 1] += load
+        Args:
+            building_components: Dictionary of building components
+            outdoor_conditions: Outdoor weather conditions
+            indoor_conditions: Indoor design conditions
+            internal_loads: Internal heat gains
+            building_volume: Building volume in cubic meters
+            
+        Returns:
+            Dictionary containing hourly cooling loads
+        """
+        hourly_loads = {
+            'walls': {h: 0.0 for h in range(1, 25)},
+            'roofs': {h: 0.0 for h in range(1, 25)},
+            'windows_conduction': {h: 0.0 for h in range(1, 25)},
+            'windows_solar': {h: 0.0 for h in range(1, 25)},
+            'doors': {h: 0.0 for h in range(1, 25)},
+            'people_sensible': {h: 0.0 for h in range(1, 25)},
+            'people_latent': {h: 0.0 for h in range(1, 25)},
+            'lights': {h: 0.0 for h in range(1, 25)},
+            'equipment_sensible': {h: 0.0 for h in range(1, 25)},
+            'equipment_latent': {h: 0.0 for h in range(1, 25)},
+            'infiltration_sensible': {h: 0.0 for h in range(1, 25)},
+            'infiltration_latent': {h: 0.0 for h in range(1, 25)},
+            'ventilation_sensible': {h: 0.0 for h in range(1, 25)},
+            'ventilation_latent': {h: 0.0 for h in range(1, 25)}
+        }
         
-        # Calculate loads for roofs
-        for roof in building_components.get('roofs', []):
+        try:
+            # Calculate loads for walls
+            for wall in building_components.get('walls', []):
+                for hour in range(24):
+                    load = self.calculate_wall_cooling_load(
+                        wall=wall,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature'],
+                        month=outdoor_conditions['month'],
+                        hour=hour,
+                        latitude=outdoor_conditions['latitude']
+                    )
+                    hourly_loads['walls'][hour + 1] += load
+            
+            # Calculate loads for roofs
+            for roof in building_components.get('roofs', []):
+                for hour in range(24):
+                    load = self.calculate_roof_cooling_load(
+                        roof=roof,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature'],
+                        month=outdoor_conditions['month'],
+                        hour=hour,
+                        latitude=outdoor_conditions['latitude']
+                    )
+                    hourly_loads['roofs'][hour + 1] += load
+            
+            # Calculate loads for windows
+            for window in building_components.get('windows', []):
+                for hour in range(24):
+                    load_dict = self.calculate_window_cooling_load(
+                        window=window,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature'],
+                        month=outdoor_conditions['month'],
+                        hour=hour,
+                        latitude=outdoor_conditions['latitude'],
+                        shading_coefficient=window.shading_coefficient
+                    )
+                    hourly_loads['windows_conduction'][hour + 1] += load_dict['conduction']
+                    hourly_loads['windows_solar'][hour + 1] += load_dict['solar']
+            
+            # Calculate loads for doors
+            for door in building_components.get('doors', []):
+                for hour in range(24):
+                    load = self.calculate_door_cooling_load(
+                        door=door,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature']
+                    )
+                    hourly_loads['doors'][hour + 1] += load
+            
+            # Calculate internal loads
             for hour in range(24):
-                load = self.calculate_roof_cooling_load(
-                    roof=roof,
+                # People loads
+                people_load = self.calculate_people_cooling_load(
+                    num_people=internal_loads['people']['number'],
+                    activity_level=internal_loads['people']['activity_level'],
+                    hour=hour
+                )
+                hourly_loads['people_sensible'][hour + 1] += people_load['sensible']
+                hourly_loads['people_latent'][hour + 1] += people_load['latent']
+                
+                # Lighting loads
+                lights_load = self.calculate_lights_cooling_load(
+                    power=internal_loads['lights']['power'],
+                    use_factor=internal_loads['lights']['use_factor'],
+                    special_allowance=internal_loads['lights']['special_allowance'],
+                    hour=hour
+                )
+                hourly_loads['lights'][hour + 1] += lights_load
+                
+                # Equipment loads
+                equipment_load = self.calculate_equipment_cooling_load(
+                    power=internal_loads['equipment']['power'],
+                    use_factor=internal_loads['equipment']['use_factor'],
+                    radiation_factor=internal_loads['equipment']['radiation_factor'],
+                    hour=hour
+                )
+                hourly_loads['equipment_sensible'][hour + 1] += equipment_load['sensible']
+                hourly_loads['equipment_latent'][hour + 1] += equipment_load['latent']
+                
+                # Infiltration loads
+                infiltration_load = self.calculate_infiltration_cooling_load(
+                    flow_rate=internal_loads['infiltration']['flow_rate'],
+                    building_volume=building_volume,
                     outdoor_temp=outdoor_conditions['temperature'],
+                    outdoor_rh=outdoor_conditions['relative_humidity'],
                     indoor_temp=indoor_conditions['temperature'],
-                    month=outdoor_conditions['month'],
-                    hour=hour,
-                    latitude=outdoor_conditions['latitude']
+                    indoor_rh=indoor_conditions['relative_humidity']
                 )
-                hourly_loads['roofs'][hour + 1] += load
-        
-        # Calculate loads for windows
-        for window in building_components.get('windows', []):
-            for hour in range(24):
-                load_dict = self.calculate_window_cooling_load(
-                    window=window,
+                hourly_loads['infiltration_sensible'][hour + 1] += infiltration_load['sensible']
+                hourly_loads['infiltration_latent'][hour + 1] += infiltration_load['latent']
+                
+                # Ventilation loads
+                ventilation_load = self.calculate_ventilation_cooling_load(
+                    flow_rate=internal_loads['ventilation']['flow_rate'],
                     outdoor_temp=outdoor_conditions['temperature'],
+                    outdoor_rh=outdoor_conditions['relative_humidity'],
                     indoor_temp=indoor_conditions['temperature'],
-                    month=outdoor_conditions['month'],
-                    hour=hour,
-                    latitude=outdoor_conditions['latitude'],
-                    shading_coefficient=window.shading_coefficient
+                    indoor_rh=indoor_conditions['relative_humidity']
                 )
-                hourly_loads['windows_conduction'][hour + 1] += load_dict['conduction']
-                hourly_loads['windows_solar'][hour + 1] += load_dict['solar']
+                hourly_loads['ventilation_sensible'][hour + 1] += ventilation_load['sensible']
+                hourly_loads['ventilation_latent'][hour + 1] += ventilation_load['latent']
         
-        # Calculate loads for doors
-        for door in building_components.get('doors', []):
-            for hour in range(24):
-                load = self.calculate_door_cooling_load(
-                    door=door,
-                    outdoor_temp=outdoor_conditions['temperature'],
-                    indoor_temp=indoor_conditions['temperature']
-                )
-                hourly_loads['doors'][hour + 1] += load
+            return hourly_loads
         
-        # Calculate internal loads
-        for hour in range(24):
-            # People loads
-            people_load = self.calculate_people_cooling_load(
-                num_people=internal_loads['people']['number'],
-                activity_level=internal_loads['people']['activity_level'],
-                hour=hour
-            )
-            hourly_loads['people_sensible'][hour + 1] += people_load['sensible']
-            hourly_loads['people_latent'][hour + 1] += people_load['latent']
-            
-            # Lighting loads
-            lights_load = self.calculate_lights_cooling_load(
-                power=internal_loads['lights']['power'],
-                use_factor=internal_loads['lights']['use_factor'],
-                special_allowance=internal_loads['lights']['special_allowance'],
-                hour=hour
-            )
-            hourly_loads['lights'][hour + 1] += lights_load
-            
-            # Equipment loads
-            equipment_load = self.calculate_equipment_cooling_load(
-                power=internal_loads['equipment']['power'],
-                use_factor=internal_loads['equipment']['use_factor'],
-                radiation_factor=internal_loads['equipment']['radiation_factor'],
-                hour=hour
-            )
-            hourly_loads['equipment_sensible'][hour + 1] += equipment_load['sensible']
-            hourly_loads['equipment_latent'][hour + 1] += equipment_load['latent']
-            
-            # Infiltration loads
-            infiltration_load = self.calculate_infiltration_cooling_load(
-                flow_rate=internal_loads['infiltration']['flow_rate'],
-                building_volume=building_volume,
-                outdoor_temp=outdoor_conditions['temperature'],
-                outdoor_rh=outdoor_conditions['relative_humidity'],
-                indoor_temp=indoor_conditions['temperature'],
-                indoor_rh=indoor_conditions['relative_humidity']
-            )
-            hourly_loads['infiltration_sensible'][hour + 1] += infiltration_load['sensible']
-            hourly_loads['infiltration_latent'][hour + 1] += infiltration_load['latent']
-            
-            # Ventilation loads
-            ventilation_load = self.calculate_ventilation_cooling_load(
-                flow_rate=internal_loads['ventilation']['flow_rate'],
-                outdoor_temp=outdoor_conditions['temperature'],
-                outdoor_rh=outdoor_conditions['relative_humidity'],
-                indoor_temp=indoor_conditions['temperature'],
-                indoor_rh=indoor_conditions['relative_humidity']
-            )
-            hourly_loads['ventilation_sensible'][hour + 1] += ventilation_load['sensible']
-            hourly_loads['ventilation_latent'][hour + 1] += ventilation_load['latent']
-    
-        return hourly_loads
-    
-    except Exception as e:
-        raise Exception(f"Error in calculate_hourly_cooling_loads: {str(e)}")
+        except Exception as e:
+            raise Exception(f"Error in calculate_hourly_cooling_loads: {str(e)}")
     
     def calculate_design_cooling_load(self, hourly_loads: Dict[str, Any]) -> Dict[str, Any]:
         """
@@ -186,7 +186,7 @@ class CoolingLoadCalculator:
             design_loads = {}
             total_loads = []
             
-            for hour in self.hours:
+            for hour in range(1, 25):
                 total_load = sum([
                     hourly_loads['walls'][hour],
                     hourly_loads['roofs'][hour],
@@ -205,7 +205,7 @@ class CoolingLoadCalculator:
                 ])
                 total_loads.append(total_load)
             
-            design_hour = self.hours[np.argmax(total_loads)]
+            design_hour = range(1, 25)[np.argmax(total_loads)]
             
             design_loads = {
                 'design_hour': design_hour,
@@ -632,7 +632,7 @@ if __name__ == "__main__":
             orientation=Orientation.HORIZONTAL,
             area=100.0,
             u_value=0.3,
-            roof_group="1"
+            roof_group="A"
         )],
         'windows': [Window(
             name="South Window",
@@ -656,7 +656,7 @@ if __name__ == "__main__":
         'relative_humidity': 50.0,
         'ground_temperature': 20.0,
         'month': 'Jul',
-        'latitude': '31.973N',
+        'latitude': '24N',
         'wind_speed': 4.0,
         'day_of_year': 204
     }
@@ -701,7 +701,7 @@ if __name__ == "__main__":
     hourly_loads = calculator.calculate_hourly_cooling_loads(
         building_components=building_components,
         outdoor_conditions=outdoor_conditions,
-        indoor_conditions=indoor_conditions,
+        indoor_conditions=indoors_conditions,
         internal_loads=internal_loads,
         building_volume=building_volume
     )