Update app/hvac_loads.py

app/hvac_loads.py

@@ -14,13 +14,12 @@ import pandas as pd
 from typing import Dict, List, Optional, NamedTuple, Any, Tuple
 from enum import Enum
 import streamlit as st
-from data.material_library import Construction, GlazingMaterial, DoorMaterial, Material, MaterialLibrary
-from data.internal_loads import PEOPLE_ACTIVITY_LEVELS, DIVERSITY_FACTORS, LIGHTING_FIXTURE_TYPES, EQUIPMENT_HEAT_GAINS, VENTILATION_RATES, INFILTRATION_SETTINGS
 from datetime import datetime
 from collections import defaultdict
 import logging
 import math
 from utils.ctf_calculations import CTFCalculator, ComponentType, CTFCoefficients
+from data.material_library import Construction, GlazingMaterial, DoorMaterial, Material, MaterialLibrary
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -54,7 +53,7 @@ class TFMCalculations:
     }
 
     @staticmethod
-    def calculate_conduction_load(component, outdoor_temp: float, indoor_temp: float, hour: int, mode: str = "none") -> tuple[float, float]:
+    def calculate_conduction_load(component: Any, outdoor_temp: float, indoor_temp: float, hour: int, mode: str = "none") -> Tuple[float, float]:
         """Calculate conduction load for heating and cooling in kW based on mode."""
         if mode == "none":
             return 0, 0
@@ -65,34 +64,21 @@ class TFMCalculations:
             return 0, 0
 
         # Get CTF coefficients using CTFCalculator
-        ctf = CTFCalculator.calculate_ctf_coefficients(component)
-        
-        # Initialize history terms (simplified: assume steady-state history for demonstration)
-        # In practice, maintain temperature and flux histories
+        if not hasattr(component, 'ctf'):
+            component.ctf = CTFCalculator.calculate_ctf_coefficients(component)
+
+        # Initialize history terms (simplified: assume steady-state history)
         load = component.u_value * component.area * delta_t
-        for i in range(len(ctf.Y)):
-            load += component.area * ctf.Y[i] * (outdoor_temp - indoor_temp) * np.exp(-i * 3600 / 3600)
-            load -= component.area * ctf.Z[i] * (outdoor_temp - indoor_temp) * np.exp(-i * 3600 / 3600)
-            # Note: F terms require flux history, omitted here for simplicity
+        for i in range(len(component.ctf.Y)):
+            load += component.area * component.ctf.Y[i] * (outdoor_temp - indoor_temp) * np.exp(-i * 3600 / 3600)
+            load -= component.area * component.ctf.Z[i] * (outdoor_temp - indoor_temp) * np.exp(-i * 3600 / 3600)
         cooling_load = load / 1000 if mode == "cooling" else 0
         heating_load = -load / 1000 if mode == "heating" else 0
         return cooling_load, heating_load
 
     @staticmethod
     def day_of_year(month: int, day: int, year: int) -> int:
-        """Calculate day of the year (n) from month, day, and year, accounting for leap years.
-
-        Args:
-            month (int): Month of the year (1-12).
-            day (int): Day of the month (1-31).
-            year (int): Year.
-
-        Returns:
-            int: Day of the year (1-365 or 366 for leap years).
-
-        References:
-            ASHRAE Handbook—Fundamentals, Chapter 18.
-        """
+        """Calculate day of the year (n) from month, day, and year, accounting for leap years."""
         days_in_month = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
         if year % 4 == 0 and (year % 100 != 0 or year % 400 == 0):
             days_in_month[1] = 29
@@ -100,17 +86,7 @@ class TFMCalculations:
 
     @staticmethod
     def equation_of_time(n: int) -> float:
-        """Calculate Equation of Time (EOT) in minutes using Spencer's formula.
-
-        Args:
-            n (int): Day of the year (1-365 or 366).
-
-        Returns:
-            float: Equation of Time in minutes.
-
-        References:
-            ASHRAE Handbook—Fundamentals, Chapter 18.
-        """
+        """Calculate Equation of Time (EOT) in minutes using Spencer's formula."""
         B = (n - 1) * 360 / 365
         B_rad = math.radians(B)
         EOT = 229.2 * (0.000075 + 0.001868 * math.cos(B_rad) - 0.032077 * math.sin(B_rad) -
@@ -119,325 +95,195 @@ class TFMCalculations:
 
     @staticmethod
     def calculate_dynamic_shgc(glazing_type: str, cos_theta: float) -> float:
-        """Calculate dynamic SHGC based on incidence angle.
-
-        Args:
-            glazing_type (str): Type of glazing (e.g., 'Single Clear').
-            cos_theta (float): Cosine of the angle of incidence.
-
-        Returns:
-            float: Dynamic SHGC value.
-
-        References:
-            ASHRAE Handbook—Fundamentals, Chapter 15, Table 13.
-        """
+        """Calculate dynamic SHGC based on incidence angle."""
         if glazing_type not in TFMCalculations.SHGC_COEFFICIENTS:
             logger.warning(f"Unknown glazing type '{glazing_type}'. Using default SHGC coefficients for Single Clear.")
             glazing_type = "Single Clear"
         
         c = TFMCalculations.SHGC_COEFFICIENTS[glazing_type]
-        # Incidence angle modifier: f(cos(θ)) = c_0 + c_1·cos(θ) + c_2·cos²(θ) + c_3·cos³(θ) + c_4·cos⁴(θ) + c_5·cos⁵(θ)
         f_cos_theta = (c[0] + c[1] * cos_theta + c[2] * cos_theta**2 +
                        c[3] * cos_theta**3 + c[4] * cos_theta**4 + c[5] * cos_theta**5)
-        return f_cos_theta
+        return max(min(f_cos_theta, 1.0), 0.0)
 
     @staticmethod
-    def get_surface_parameters(component: Any, building_info: Dict, material_library: MaterialLibrary, 
-                             project_materials: Dict, project_constructions: Dict, 
+    def get_surface_parameters(component: Any, building_info: Dict, material_library: MaterialLibrary,
+                             project_materials: Dict, project_constructions: Dict,
                              project_glazing_materials: Dict, project_door_materials: Dict) -> Tuple[float, float, float, Optional[float], float]:
         """
-        Determine surface parameters (tilt, azimuth, h_o, emissivity, solar_absorption) for a component.
-        Uses MaterialLibrary to fetch properties from first layer for walls/roofs, DoorMaterial for doors,
-        and GlazingMaterial for windows/skylights. Handles orientation and tilt based on component type:
-        - Walls, Doors, Windows: Azimuth = elevation base azimuth + component.rotation; Tilt = 90°.
-        - Roofs, Skylights: Azimuth = component.orientation; Tilt = component.tilt (default 180°).
-        
-        Args:
-            component: Component object with component_type, elevation, rotation, orientation, tilt,
-                      construction, glazing_material, or door_material.
-            building_info (Dict): Building information containing orientation_angle for elevation mapping.
-            material_library: MaterialLibrary instance for accessing library materials/constructions.
-            project_materials: Dict of project-specific Material objects.
-            project_constructions: Dict of project-specific Construction objects.
-            project_glazing_materials: Dict of project-specific GlazingMaterial objects.
-            project_door_materials: Dict of project-specific DoorMaterial objects.
-
-        Returns:
-            Tuple[float, float, float, Optional[float], float]: Surface tilt (°), surface azimuth (°),
-            h_o (W/m²·K), emissivity, solar_absorption.
+        Determine surface parameters for a component using new component structure.
         """
-        # Default parameters
         component_name = getattr(component, 'name', 'unnamed_component')
         
-        # Initialize default values
-        surface_tilt = 90.0  # Default vertical for walls, windows, doors
-        surface_azimuth = 0.0  # Default north-facing
-        h_o = 17.0  # Default exterior convection coefficient
+        # Use component's pre-calculated surface properties
+        surface_tilt = getattr(component, 'tilt', 90.0)
+        surface_azimuth = getattr(component, 'surface_azimuth', 0.0)
+        h_o = 17.0  # Default for walls/windows/doors
         emissivity = 0.9  # Default for opaque components
-        solar_absorption = 0.6  # Default
-        
+        absorptivity = 0.6  # Default for opaque components
+
         try:
-            # Set component-specific defaults based on type
+            # Adjust defaults based on component type
             if component.component_type == ComponentType.ROOF:
-                surface_tilt = getattr(component, 'tilt', 0.0)  # Horizontal, upward if tilt absent
-                h_o = 23.0  # W/m²·K for roofs
-                # For roofs, use orientation directly
-                surface_azimuth = getattr(component, 'orientation', 0.0)
-                logger.debug(f"Roof component {component_name}: using orientation={surface_azimuth}, tilt={surface_tilt}")
-                
+                h_o = 23.0
             elif component.component_type == ComponentType.SKYLIGHT:
-                surface_tilt = getattr(component, 'tilt', 0.0)  # Horizontal, upward if tilt absent
-                h_o = 23.0  # W/m²·K for skylights
-                # For skylights, use orientation directly, not elevation
-                surface_azimuth = getattr(component, 'orientation', 0.0)
-                logger.debug(f"Skylight component {component_name}: using orientation={surface_azimuth}, tilt={surface_tilt}")
-                
+                h_o = 23.0
             elif component.component_type == ComponentType.FLOOR:
-                surface_tilt = 180.0  # Horizontal, downward
-                h_o = 17.0  # W/m²·K
-                surface_azimuth = 0.0  # Default azimuth for floors
-                logger.debug(f"Floor component {component_name}: using default azimuth={surface_azimuth}, tilt={surface_tilt}")
-                
-            else:  # WALL, DOOR, WINDOW
-                surface_tilt = 90.0  # Vertical
-                h_o = 17.0  # W/m²·K
-                
-                # Check for elevation attribute
-                elevation = getattr(component, 'elevation', None)
-                if not elevation:
-                    logger.warning(f"Component {component_name} ({component.component_type.value}) is missing 'elevation' field. Using default azimuth=0.")
-                    surface_azimuth = 0.0  # Default to north-facing if elevation is missing
-                else:
-                    # Define elevation azimuths based on building orientation_angle
-                    base_azimuth = building_info.get("orientation_angle", 0.0)
-                    elevation_angles = {
-                        "A": base_azimuth,
-                        "B": (base_azimuth + 90.0) % 360,
-                        "C": (base_azimuth + 180.0) % 360,
-                        "D": (base_azimuth + 270.0) % 360
-                    }
-
-                    if elevation not in elevation_angles:
-                        logger.warning(f"Invalid elevation '{elevation}' for component {component_name} ({component.component_type.value}). "
-                                      f"Expected one of {list(elevation_angles.keys())}. Using default azimuth=0.")
-                        surface_azimuth = 0.0  # Default to north-facing if elevation is invalid
-                    else:
-                        # Add component rotation to elevation azimuth
-                        surface_azimuth = (elevation_angles[elevation] + getattr(component, 'rotation', 0.0)) % 360
-                        logger.debug(f"Component {component_name} ({component.component_type.value}): elevation={elevation}, "
-                                    f"base_azimuth={elevation_angles[elevation]}, rotation={getattr(component, 'rotation', 0.0)}, "
-                                    f"total_azimuth={surface_azimuth}, tilt={surface_tilt}")
+                surface_tilt = 180.0
+                surface_azimuth = 0.0
+                h_o = 17.0
 
             # Fetch material properties
             if component.component_type in [ComponentType.WALL, ComponentType.ROOF]:
-                construction = getattr(component, 'construction', None)
-                if not construction:
-                    logger.warning(f"No construction defined for {component_name} ({component.component_type.value}). "
-                                  f"Using defaults: solar_absorption=0.6, emissivity=0.9.")
+                construction_name = getattr(component, 'construction', None)
+                if not construction_name:
+                    logger.warning(f"No construction defined for {component_name} ({component.component_type.value}). Using defaults.")
                 else:
-                    # Get construction from library or project
-                    construction_obj = None
-                    if hasattr(construction, 'name'):
-                        construction_obj = (project_constructions.get(construction.name) or
-                                           material_library.library_constructions.get(construction.name))
-                    
+                    construction_obj = (project_constructions.get(construction_name) or
+                                      material_library.library_constructions.get(construction_name))
                     if not construction_obj:
-                        logger.warning(f"Construction not found for {component_name} ({component.component_type.value}). "
-                                      f"Using defaults: solar_absorption=0.6, emissivity=0.9.")
+                        logger.warning(f"Construction {construction_name} not found for {component_name}. Using defaults.")
                     elif not construction_obj.layers:
-                        logger.warning(f"No layers in construction for {component_name} ({component.component_type.value}). "
-                                      f"Using defaults: solar_absorption=0.6, emissivity=0.9.")
+                        logger.warning(f"No layers in construction {construction_name} for {component_name}. Using defaults.")
                     else:
-                        # Use first (outermost) layer's properties
                         first_layer = construction_obj.layers[0]
-                        material = first_layer.get("material")
+                        material = (project_materials.get(first_layer['material']) or
+                                   material_library.library_materials.get(first_layer['material']))
                         if material:
-                            solar_absorption = getattr(material, 'solar_absorption', 0.6)
+                            absorptivity = getattr(material, 'absorptivity', 0.6)
                             emissivity = getattr(material, 'emissivity', 0.9)
-                            logger.debug(f"Using first layer material for {component_name} ({component.component_type.value}): "
-                                        f"solar_absorption={solar_absorption}, emissivity={emissivity}")
+                            logger.debug(f"Using first layer material for {component_name}: "
+                                        f"absorptivity={absorptivity}, emissivity={emissivity}")
 
             elif component.component_type == ComponentType.DOOR:
-                door_material = getattr(component, 'door_material', None)
-                if not door_material:
-                    logger.warning(f"No door material defined for {component_name} ({component.component_type.value}). "
-                                  f"Using defaults: solar_absorption=0.6, emissivity=0.9.")
+                door_material_name = getattr(component, 'door_material', None)
+                if not door_material_name:
+                    logger.warning(f"No door material defined for {component_name}. Using defaults.")
                 else:
-                    # Get door material from library or project
-                    door_material_obj = None
-                    if hasattr(door_material, 'name'):
-                        door_material_obj = (project_door_materials.get(door_material.name) or
-                                            material_library.library_door_materials.get(door_material.name))
-                    
+                    door_material_obj = (project_door_materials.get(door_material_name) or
+                                        material_library.library_door_materials.get(door_material_name))
                     if not door_material_obj:
-                        logger.warning(f"Door material not found for {component_name} ({component.component_type.value}). "
-                                      f"Using defaults: solar_absorption=0.6, emissivity=0.9.")
+                        logger.warning(f"Door material {door_material_name} not found for {component_name}. Using defaults.")
                     else:
-                        solar_absorption = getattr(door_material_obj, 'solar_absorption', 0.6)
+                        absorptivity = getattr(door_material_obj, 'absorptivity', 0.6)
                         emissivity = getattr(door_material_obj, 'emissivity', 0.9)
-                        logger.debug(f"Using door material for {component_name} ({component.component_type.value}): "
-                                    f"solar_absorption={solar_absorption}, emissivity={emissivity}")
+                        logger.debug(f"Using door material for {component_name}: "
+                                    f"absorptivity={absorptivity}, emissivity={emissivity}")
 
             elif component.component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                glazing_material = getattr(component, 'glazing_material', None)
-                if not glazing_material:
-                    logger.warning(f"No glazing material defined for {component_name} ({component.component_type.value}). "
-                                  f"Using default SHGC=0.7, h_o={h_o}.")
+                fenestration_name = getattr(component, 'fenestration', None)
+                if not fenestration_name:
+                    logger.warning(f"No fenestration defined for {component_name}. Using default SHGC=0.7.")
                     shgc = 0.7
                 else:
-                    # Get glazing material from library or project
-                    glazing_material_obj = None
-                    if hasattr(glazing_material, 'name'):
-                        glazing_material_obj = (project_glazing_materials.get(glazing_material.name) or
-                                               material_library.library_glazing_materials.get(glazing_material.name))
-                    
+                    glazing_material_obj = (project_glazing_materials.get(fenestration_name) or
+                                          material_library.library_glazing_materials.get(fenestration_name))
                     if not glazing_material_obj:
-                        logger.warning(f"Glazing material not found for {component_name} ({component.component_type.value}). "
-                                      f"Using default SHGC=0.7, h_o={h_o}.")
+                        logger.warning(f"Fenestration {fenestration_name} not found for {component_name}. Using default SHGC=0.7.")
                         shgc = 0.7
                     else:
                         shgc = getattr(glazing_material_obj, 'shgc', 0.7)
                         h_o = getattr(glazing_material_obj, 'h_o', h_o)
-                        logger.debug(f"Using glazing material for {component_name} ({component.component_type.value}): "
-                                    f"shgc={shgc}, h_o={h_o}")
-                emissivity = None  # Not used for glazing
+                        logger.debug(f"Using glazing material for {component_name}: shgc={shgc}, h_o={h_o}")
+                emissivity = None
 
         except Exception as e:
-            logger.error(f"Error retrieving surface parameters for {component_name} ({component.component_type.value}): {str(e)}")
-            # Apply defaults based on component type
+            logger.error(f"Error retrieving surface parameters for {component_name}: {str(e)}")
             if component.component_type == ComponentType.ROOF:
-                surface_tilt = 0.0  # Horizontal, upward
-                h_o = 23.0  # W/m²·K for roofs
-                surface_azimuth = 0.0  # Default north
+                surface_tilt = 0.0
+                surface_azimuth = 0.0
+                h_o = 23.0
             elif component.component_type == ComponentType.SKYLIGHT:
-                surface_tilt = 0.0  # Horizontal, upward
-                h_o = 23.0  # W/m²·K for skylights
-                surface_azimuth = 0.0  # Default north
+                surface_tilt = 0.0
+                surface_azimuth = 0.0
+                h_o = 23.0
             elif component.component_type == ComponentType.FLOOR:
-                surface_tilt = 180.0  # Horizontal, downward
-                h_o = 17.0  # W/m²·K
-                surface_azimuth = 0.0  # Default north
-            else:  # WALL, DOOR, WINDOW
-                surface_tilt = 90.0  # Vertical
-                h_o = 17.0  # W/m²·K
-                surface_azimuth = 0.0  # Default north
-            
-            # Apply material defaults
-            if component.component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR]:
-                solar_absorption = 0.6
-                emissivity = 0.9
-            else:  # WINDOW, SKYLIGHT
-                shgc = 0.7
-                emissivity = None
-
-        # Debug output for all components
-        logger.info(f"Final surface parameters for {component_name} ({component.component_type.value}): "
-                   f"tilt={surface_tilt:.1f}, azimuth={surface_azimuth:.1f}, h_o={h_o:.1f}")
+                surface_tilt = 180.0
+                surface_azimuth = 0.0
+                h_o = 17.0
+            else:
+                surface_tilt = 90.0
+                surface_azimuth = 0.0
+                h_o = 17.0
+            absorptivity = 0.6
+            emissivity = 0.9 if component.component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR] else None
 
-        return surface_tilt, surface_azimuth, h_o, emissivity, solar_absorption
+        logger.info(f"Surface parameters for {component_name}: tilt={surface_tilt:.1f}, azimuth={surface_azimuth:.1f}, h_o={h_o:.1f}")
+        return surface_tilt, surface_azimuth, h_o, emissivity, absorptivity
 
     @staticmethod
-    def calculate_solar_load(component, hourly_data: Dict, hour: int, building_orientation: float, mode: str = "none") -> float:
-        """Calculate solar load in kW (cooling only) using ASHRAE-compliant solar calculations.
-        
-        Args:
-            component: Component object with area, component_type, elevation, glazing_material, shgc, iac.
-            hourly_data (Dict): Hourly weather data including solar radiation.
-            hour (int): Current hour.
-            building_orientation (float): Building orientation angle in degrees.
-            mode (str): Operating mode ('cooling', 'heating', 'none').
-
-        Returns:
-            float: Solar cooling load in kW. Returns 0 for non-cooling modes or non-fenestration components.
-
-        References:
-            ASHRAE Handbook—Fundamentals, Chapters 15 and 18.
-        """
-        # Only calculate solar loads in cooling mode
-        if mode != "cooling":
-            return 0
-            
-        # Skip floors for solar calculation
-        if component.component_type == ComponentType.FLOOR:
+    def calculate_solar_load(component: Any, hourly_data: Dict, hour: int, building_orientation: float, mode: str = "none") -> float:
+        """Calculate solar load in kW (cooling only) using ASHRAE-compliant solar calculations."""
+        if mode != "cooling" or component.component_type == ComponentType.FLOOR:
             return 0
 
         component_name = getattr(component, 'name', 'unnamed_component')
 
         try:
-            # Ensure MaterialLibrary is properly initialized and accessible
-            material_library = st.session_state.get("material_library")
-            if not material_library:
-                logger.error(f"MaterialLibrary not found in session_state for {component_name} ({component.component_type.value})")
-                # Instead of raising an error, initialize a new MaterialLibrary
-                from data.material_library import MaterialLibrary
-                material_library = MaterialLibrary()
-                st.session_state.material_library = material_library
-                logger.info(f"Created new MaterialLibrary for {component_name} ({component.component_type.value})")
-            
-            project_materials = st.session_state.get("project_materials", {})
-            project_constructions = st.session_state.get("project_constructions", {})
-            project_glazing_materials = st.session_state.get("project_glazing_materials", {})
-            project_door_materials = st.session_state.get("project_door_materials", {})
+            # Initialize MaterialLibrary if not present
+            if "material_library" not in st.session_state:
+                st.session_state.material_library = MaterialLibrary()
+                logger.info(f"Initialized MaterialLibrary for {component_name}")
+
+            material_library = st.session_state.material_library
+            project_materials = st.session_state.project_data["materials"]["project"]
+            project_constructions = st.session_state.project_data["constructions"]["project"]
+            project_glazing_materials = st.session_state.project_data["fenestrations"]["project"]
+            project_door_materials = st.session_state.project_data.get("door_materials", {})
 
             # Get location parameters from climate_data
-            climate_data = st.session_state.get("climate_data", {})
+            climate_data = st.session_state.project_data["climate_data"]
             latitude = climate_data.get("latitude", 0.0)
             longitude = climate_data.get("longitude", 0.0)
-            timezone = climate_data.get("time_zone", 0.0)
-
-            # Get ground reflectivity (default 0.2)
-            ground_reflectivity = st.session_state.get("ground_reflectivity", 0.2)
+            timezone = climate_data.get("timezone", 0.0)
+            ground_reflectivity = climate_data.get("ground_reflectivity", 0.2)
 
-            # Validate input parameters
+            # Validate inputs
             if not -90 <= latitude <= 90:
-                logger.warning(f"Invalid latitude {latitude} for {component_name} ({component.component_type.value}). Using default 0.0.")
+                logger.warning(f"Invalid latitude {latitude} for {component_name}. Using default 0.0.")
                 latitude = 0.0
             if not -180 <= longitude <= 180:
-                logger.warning(f"Invalid longitude {longitude} for {component_name} ({component.component_type.value}). Using default 0.0.")
+                logger.warning(f"Invalid longitude {longitude} for {component_name}. Using default 0.0.")
                 longitude = 0.0
             if not -12 <= timezone <= 14:
-                logger.warning(f"Invalid timezone {timezone} for {component_name} ({component.component_type.value}). Using default 0.0.")
+                logger.warning(f"Invalid timezone {timezone} for {component_name}. Using default 0.0.")
                 timezone = 0.0
             if not 0 <= ground_reflectivity <= 1:
-                logger.warning(f"Invalid ground_reflectivity {ground_reflectivity} for {component_name} ({component.component_type.value}). Using default 0.2.")
+                logger.warning(f"Invalid ground_reflectivity {ground_reflectivity} for {component_name}. Using default 0.2.")
                 ground_reflectivity = 0.2
 
             # Ensure hourly_data has required fields
-            required_fields = ["month", "day", "hour", "global_horizontal_radiation", "direct_normal_radiation", 
-                             "diffuse_horizontal_radiation", "dry_bulb"]
+            required_fields = ["month", "day", "hour", "global_horizontal_radiation", "direct_normal_radiation",
+                              "diffuse_horizontal_radiation", "dry_bulb"]
             if not all(field in hourly_data for field in required_fields):
-                logger.warning(f"Missing required fields in hourly_data for hour {hour} for {component_name} ({component.component_type.value}): {hourly_data}")
+                logger.warning(f"Missing required fields in hourly_data for hour {hour} for {component_name}: {hourly_data}")
                 return 0
 
-            # Skip if GHI <= 0
             if hourly_data["global_horizontal_radiation"] <= 0:
-                logger.info(f"No solar load for hour {hour} due to GHI={hourly_data['global_horizontal_radiation']} for {component_name} ({component.component_type.value})")
+                logger.info(f"No solar load for hour {hour} due to GHI={hourly_data['global_horizontal_radiation']} for {component_name}")
                 return 0
 
-            # Extract weather data
             month = hourly_data["month"]
             day = hourly_data["day"]
             hour = hourly_data["hour"]
             ghi = hourly_data["global_horizontal_radiation"]
-            dni = hourly_data.get("direct_normal_radiation", ghi * 0.7)  # Fallback: estimate DNI
-            dhi = hourly_data.get("diffuse_horizontal_radiation", ghi * 0.3)  # Fallback: estimate DHI
+            dni = hourly_data.get("direct_normal_radiation", ghi * 0.7)
+            dhi = hourly_data.get("diffuse_horizontal_radiation", ghi * 0.3)
             outdoor_temp = hourly_data["dry_bulb"]
 
             if ghi < 0 or dni < 0 or dhi < 0:
-                logger.error(f"Negative radiation values for {month}/{day}/{hour} for {component_name} ({component.component_type.value})")
+                logger.error(f"Negative radiation values for {month}/{day}/{hour} for {component_name}")
                 raise ValueError(f"Negative radiation values for {month}/{day}/{hour}")
 
-            # Add detailed logging for solar calculation
             logger.info(f"Processing solar for {month}/{day}/{hour} with GHI={ghi}, DNI={dni}, DHI={dhi}, "
-                       f"dry_bulb={outdoor_temp} for {component_name} ({component.component_type.value})")
+                       f"dry_bulb={outdoor_temp} for {component_name}")
 
-            # Step 1: Local Solar Time (LST) with Equation of Time
-            year = 2025  # Fixed year since not provided
+            # Step 1: Local Solar Time (LST)
+            year = 2025
             n = TFMCalculations.day_of_year(month, day, year)
             EOT = TFMCalculations.equation_of_time(n)
-            lambda_std = 15 * timezone  # Standard meridian longitude (°)
-            standard_time = hour - 1 + 0.5  # Convert to decimal, assume mid-hour
-            LST = standard_time + (4 * (lambda_std - longitude) + EOT) / 60 
+            lambda_std = 15 * timezone
+            standard_time = hour - 1 + 0.5
+            LST = standard_time + (4 * (lambda_std - longitude) + EOT) / 60
 
             # Step 2: Solar Declination (δ)
             delta = 23.45 * math.sin(math.radians(360 / 365 * (284 + n)))
@@ -454,136 +300,79 @@ class TFMCalculations:
             alpha = math.degrees(math.asin(sin_alpha))
 
             if abs(math.cos(math.radians(alpha))) < 0.01:
-                azimuth = 0  # North at sunrise/sunset
+                azimuth = 0
             else:
                 sin_az = math.cos(delta_rad) * math.sin(hra_rad) / math.cos(math.radians(alpha))
                 cos_az = (sin_alpha * math.sin(phi) - math.sin(delta_rad)) / (math.cos(math.radians(alpha)) * math.cos(phi))
                 azimuth = math.degrees(math.atan2(sin_az, cos_az))
-                if hra > 0:  # Afternoon
+                if hra > 0:
                     azimuth = 360 - azimuth if azimuth > 0 else -azimuth
 
             logger.info(f"Solar angles for {month}/{day}/{hour}: declination={delta:.2f}, LST={LST:.2f}, "
-                       f"HRA={hra:.2f}, altitude={alpha:.2f}, azimuth={azimuth:.2f} for {component_name} ({component.component_type.value})")
-
-            # Step 5: Get surface parameters with robust error handling
-            building_info = {"orientation_angle": building_orientation}
-            try:
-                surface_tilt, surface_azimuth, h_o, emissivity, solar_absorption = \
-                    TFMCalculations.get_surface_parameters(
-                        component, building_info, material_library, project_materials,
-                        project_constructions, project_glazing_materials, project_door_materials
-                    )
-            except Exception as e:
-                logger.error(f"Error getting surface parameters for {component_name}: {str(e)}. Using defaults.")
-                # Apply defaults based on component type
-                if component.component_type == ComponentType.ROOF:
-                    surface_tilt = 0.0  # Horizontal, upward
-                    surface_azimuth = 0.0  # Default north
-                elif component.component_type == ComponentType.SKYLIGHT:
-                    surface_tilt = 0.0  # Horizontal, upward
-                    surface_azimuth = 0.0  # Default north
-                elif component.component_type == ComponentType.FLOOR:
-                    surface_tilt = 180.0  # Horizontal, downward
-                    surface_azimuth = 0.0  # Default north
-                else:  # WALL, DOOR, WINDOW
-                    surface_tilt = 90.0  # Vertical
-                    surface_azimuth = 0.0  # Default north
-                
-                # Apply material defaults
-                if component.component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR]:
-                    solar_absorption = 0.6
-                    h_o = 17.0 if component.component_type == ComponentType.WALL else 23.0
-                else:  # WINDOW, SKYLIGHT
-                    solar_absorption = 0.0  # Not used for glazing
-                    h_o = 17.0 if component.component_type == ComponentType.WINDOW else 23.0
+                       f"HRA={hra:.2f}, altitude={alpha:.2f}, azimuth={azimuth:.2f} for {component_name}")
+
+            # Step 5: Get surface parameters
+            building_info = st.session_state.project_data["building_info"]
+            surface_tilt, surface_azimuth, h_o, emissivity, absorptivity = \
+                TFMCalculations.get_surface_parameters(
+                    component, building_info, material_library, project_materials,
+                    project_constructions, project_glazing_materials, project_door_materials
+                )
 
             # Step 6: Calculate angle of incidence (θ)
-            # Convert angles to radians for calculation
             alpha_rad = math.radians(alpha)
             surface_tilt_rad = math.radians(surface_tilt)
             azimuth_rad = math.radians(azimuth)
             surface_azimuth_rad = math.radians(surface_azimuth)
             
-            # Calculate cos(θ) using the solar position and surface orientation
             cos_theta = (math.sin(alpha_rad) * math.cos(surface_tilt_rad) +
                          math.cos(alpha_rad) * math.sin(surface_tilt_rad) *
                          math.cos(azimuth_rad - surface_azimuth_rad))
-            
-            # Clamp to [0, 1] to avoid numerical issues
             cos_theta = max(min(cos_theta, 1.0), 0.0)
-            
-            # Log the calculated values
-            logger.info(f"  Component {component_name} ({component.component_type.value}) at {month}/{day}/{hour}: "
+
+            logger.info(f"Component {component_name} at {month}/{day}/{hour}: "
                         f"surface_tilt={surface_tilt:.2f}, surface_azimuth={surface_azimuth:.2f}, "
                         f"cos_theta={cos_theta:.4f}")
 
             # Step 7: Calculate total incident radiation (I_t)
-            # Calculate view factor for ground-reflected radiation
             view_factor = (1 - math.cos(surface_tilt_rad)) / 2
-            
-            # Calculate ground-reflected radiation
             ground_reflected = ground_reflectivity * ghi * view_factor
-            
-            # Calculate total incident radiation
-            if cos_theta > 0:  # Surface receives direct beam radiation
-                I_t = dni * cos_theta + dhi + ground_reflected
-            else:  # Surface in shade, only diffuse and reflected
-                I_t = dhi + ground_reflected
-            
-            # Step 8: Calculate solar heat gain based on component type
+            I_t = dni * cos_theta + dhi + ground_reflected if cos_theta > 0 else dhi + ground_reflected
+
+            # Step 8: Calculate solar heat gain
             solar_heat_gain = 0.0
-            
+
             if component.component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                # For windows/skylights, get SHGC from material
-                shgc = 0.7  # Default
-                glazing_material = getattr(component, 'glazing_material', None)
-                if glazing_material:
-                    glazing_material_obj = None
-                    if hasattr(glazing_material, 'name'):
-                        glazing_material_obj = (project_glazing_materials.get(glazing_material.name) or
-                                               material_library.library_glazing_materials.get(glazing_material.name))
-                    
+                fenestration_name = getattr(component, 'fenestration', None)
+                shgc = 0.7
+                if fenestration_name:
+                    glazing_material_obj = (project_glazing_materials.get(fenestration_name) or
+                                          material_library.library_glazing_materials.get(fenestration_name))
                     if glazing_material_obj:
                         shgc = getattr(glazing_material_obj, 'shgc', 0.7)
                         h_o = getattr(glazing_material_obj, 'h_o', h_o)
-                    else:
-                        logger.warning(f"Glazing material not found for {component_name} ({component.component_type.value}). Using default SHGC=0.7.")
-                else:
-                    logger.warning(f"No glazing material defined for {component_name} ({component.component_type.value}). Using default SHGC=0.7.")
-                
-                # Get glazing type for dynamic SHGC calculation
-                glazing_type = "Single Clear"  # Default
-                if hasattr(component, 'name') and component.name in TFMCalculations.GLAZING_TYPE_MAPPING:
-                    glazing_type = TFMCalculations.GLAZING_TYPE_MAPPING[component.name]
-                
-                # Get internal shading coefficient
-                iac = getattr(component, 'iac', 1.0)  # Default internal shading
-                
-                # Calculate dynamic SHGC based on incidence angle
+
+                glazing_type = TFMCalculations.GLAZING_TYPE_MAPPING.get(fenestration_name, "Single Clear")
+                iac = getattr(component, 'shading_coefficient', 1.0)
                 shgc_dynamic = shgc * TFMCalculations.calculate_dynamic_shgc(glazing_type, cos_theta)
-                
-                # Calculate solar heat gain for fenestration
-                solar_heat_gain = component.area * shgc_dynamic * I_t * iac / 1000  # kW
-                
-                logger.info(f"Fenestration solar heat gain for {component_name} ({component.component_type.value}) at {month}/{day}/{hour}: "
+                solar_heat_gain = component.area * shgc_dynamic * I_t * iac / 1000
+
+                logger.info(f"Fenestration solar heat gain for {component_name} at {month}/{day}/{hour}: "
                             f"{solar_heat_gain:.4f} kW (area={component.area}, shgc_dynamic={shgc_dynamic:.4f}, "
                             f"I_t={I_t:.2f}, iac={iac})")
-            
+
             elif component.component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR]:
-                # For opaque surfaces, use solar absorptivity and surface resistance
-                surface_resistance = 1/h_o  # m²·K/W
-                
-                # Calculate absorbed solar radiation
-                solar_heat_gain = component.area * solar_absorption * I_t * surface_resistance / 1000  # kW
-                
-                logger.info(f"Opaque surface solar heat gain for {component_name} ({component.component_type.value}) at {month}/{day}/{hour}: "
-                            f"{solar_heat_gain:.4f} kW (area={component.area}, solar_absorption={solar_absorption:.2f}, "
+                surface_resistance = 1 / h_o
+                solar_heat_gain = component.area * absorptivity * I_t * surface_resistance / 1000
+
+                logger.info(f"Opaque surface solar heat gain for {component_name} at {month}/{day}/{hour}: "
+                            f"{solar_heat_gain:.4f} kW (area={component.area}, absorptivity={absorptivity:.2f}, "
                             f"I_t={I_t:.2f}, surface_resistance={surface_resistance:.4f})")
-            
+
             return solar_heat_gain
 
         except Exception as e:
-            logger.error(f"Error calculating solar load for {component_name} ({component.component_type.value}) at hour {hour}: {str(e)}")
+            logger.error(f"Error calculating solar load for {component_name} at hour {hour}: {str(e)}")
             return 0
 
     @staticmethod
@@ -591,80 +380,99 @@ class TFMCalculations:
         """Calculate total internal load in kW."""
         total_load = 0
         for group in internal_loads.get("people", []):
-            activity_data = group["activity_data"]
-            sensible = (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2
-            latent = (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2
-            load_per_person = sensible + latent
-            total_load += group["num_people"] * load_per_person * group["diversity_factor"]
+            activity_data = group.get("activity_data", {})
+            sensible = (activity_data.get("sensible_min_w", 0) + activity_data.get("sensible_max_w", 0)) / 2
+            latent = (activity_data.get("latent_min_w", 0) + activity_data.get("latent_max_w", 0)) / 2
+            schedule = internal_loads["schedules"].get(group.get("schedule", ""), {})
+            diversity_factor = schedule.get("weekday", [1.0]*24)[hour % 24] if schedule else 1.0
+            total_load += group.get("num_people", 0) * (sensible + latent) * diversity_factor
+
         for light in internal_loads.get("lighting", []):
-            lpd = light["lpd"]
-            lighting_operating_hours = light["operating_hours"]
-            fraction = min(lighting_operating_hours, operation_hours) / operation_hours if operation_hours > 0 else 0
-            lighting_load = lpd * area * fraction
+            lpd = light.get("lpd", 0)
+            schedule = internal_loads["schedules"].get(light.get("schedule", ""), {})
+            fraction = schedule.get("weekday", [1.0]*24)[hour % 24] if schedule else 1.0
+            lighting_load = lpd * light.get("area", area) * fraction
             total_load += lighting_load
-        equipment = internal_loads.get("equipment")
-        if equipment:
-            total_power_density = equipment.get("total_power_density", 0)
-            equipment_load = total_power_density * area
+
+        for equip in internal_loads.get("equipment", []):
+            sensible_gain = equip.get("sensible_gain", 0)
+            latent_gain = equip.get("latent_gain", 0)
+            schedule = internal_loads["schedules"].get(equip.get("schedule", ""), {})
+            fraction = schedule.get("weekday", [1.0]*24)[hour % 24] if schedule else 1.0
+            equipment_load = (sensible_gain + latent_gain) * equip.get("area", area) * fraction
             total_load += equipment_load
+
         return total_load / 1000
 
     @staticmethod
-    def calculate_ventilation_load(internal_loads: Dict, outdoor_temp: float, indoor_temp: float, area: float, building_info: Dict, mode: str = "none") -> tuple[float, float]:
+    def calculate_ventilation_load(internal_loads: Dict, outdoor_temp: float, indoor_temp: float, area: float, building_info: Dict, mode: str = "none") -> Tuple[float, float]:
         """Calculate ventilation load for heating and cooling in kW based on mode."""
         if mode == "none":
             return 0, 0
-        ventilation = internal_loads.get("ventilation")
+        ventilation = internal_loads.get("ventilation", [])
         if not ventilation:
             return 0, 0
-        space_rate = ventilation.get("space_rate", 0.3)  # L/s/m²
-        people_rate = ventilation.get("people_rate", 2.5)  # L/s/person
-        num_people = sum(group["num_people"] for group in internal_loads.get("people", []))
-        ventilation_flow = (space_rate * area + people_rate * num_people) / 1000  # m³/s
-        air_density = 1.2  # kg/m³
-        specific_heat = 1000  # J/kg·K
+        total_ventilation_flow = 0
+        for vent in ventilation:
+            if vent.get("system_type") == "AirChanges/Hour":
+                design_flow_rate = vent.get("design_flow_rate", 0.3)  # ACH
+                building_height = building_info.get("building_height", 3.0)
+                volume = area * building_height
+                flow = design_flow_rate * volume / 3600  # m³/s
+            else:
+                flow = vent.get("design_flow_rate", 0.0) / 1000  # L/s to m³/s
+            schedule = internal_loads["schedules"].get(vent.get("schedule", ""), {})
+            fraction = schedule.get("weekday", [1.0]*24)[hour % 24] if schedule else 1.0
+            total_ventilation_flow += flow * fraction
+
+        air_density = 1.2
+        specific_heat = 1000
         delta_t = outdoor_temp - indoor_temp
         if mode == "cooling" and delta_t <= 0:
             return 0, 0
         if mode == "heating" and delta_t >= 0:
             return 0, 0
-        load = ventilation_flow * air_density * specific_heat * delta_t / 1000  # kW
+        load = total_ventilation_flow * air_density * specific_heat * delta_t / 1000
         cooling_load = load if mode == "cooling" else 0
         heating_load = -load if mode == "heating" else 0
         return cooling_load, heating_load
 
     @staticmethod
-    def calculate_infiltration_load(internal_loads: Dict, outdoor_temp: float, indoor_temp: float, area: float, building_info: Dict, mode: str = "none") -> tuple[float, float]:
+    def calculate_infiltration_load(internal_loads: Dict, outdoor_temp: float, indoor_temp: float, area: float, building_info: Dict, mode: str = "none") -> Tuple[float, float]:
         """Calculate infiltration load for heating and cooling in kW based on mode."""
         if mode == "none":
             return 0, 0
-        infiltration = internal_loads.get("infiltration")
+        infiltration = internal_loads.get("infiltration", [])
         if not infiltration:
             return 0, 0
-        method = infiltration.get("method", "ACH")
-        settings = infiltration.get("settings", {})
-        building_height = building_info.get("building_height", 3.0)
-        volume = area * building_height  # m³
-        air_density = 1.2  # kg/m³
-        specific_heat = 1000  # J/kg·K
+        total_infiltration_flow = 0
+        for inf in infiltration:
+            if inf.get("system_type") == "AirChanges/Hour":
+                design_flow_rate = inf.get("design_flow_rate", 0.5)  # ACH
+                building_height = building_info.get("building_height", 3.0)
+                volume = area * building_height
+                flow = design_flow_rate * volume / 3600  # m³/s
+            elif inf.get("system_type") == "Crack Flow":
+                ela = inf.get("effective_air_leakage_area", 0.0001) / 10000  # cm² to m²
+                wind_speed = 4.0
+                flow = ela * area * wind_speed / 2
+            else:  # Empirical Equations
+                c = inf.get("flow_coefficient", 0.0001)
+                n = inf.get("pressure_exponent", 0.65)
+                delta_t_abs = abs(outdoor_temp - indoor_temp)
+                flow = c * (delta_t_abs ** n) * area / 3600
+            schedule = internal_loads["schedules"].get(inf.get("schedule", ""), {})
+            fraction = schedule.get("weekday", [1.0]*24)[hour % 24] if schedule else 1.0
+            total_infiltration_flow += flow * fraction
+
+        air_density = 1.2
+        specific_heat = 1000
         delta_t = outdoor_temp - indoor_temp
         if mode == "cooling" and delta_t <= 0:
             return 0, 0
         if mode == "heating" and delta_t >= 0:
             return 0, 0
-        if method == "ACH":
-            ach = settings.get("rate", 0.5)
-            infiltration_flow = ach * volume / 3600  # m³/s
-        elif method == "Crack Flow":
-            ela = settings.get("ela", 0.0001)  # m²/m²
-            wind_speed = 4.0  # m/s (assumed)
-            infiltration_flow = ela * area * wind_speed / 2  # m³/s
-        else:  # Empirical Equations
-            c = settings.get("c", 0.1)
-            n = settings.get("n", 0.65)
-            delta_t_abs = abs(delta_t)
-            infiltration_flow = c * (delta_t_abs ** n) * area / 3600  # m³/s
-        load = infiltration_flow * air_density * specific_heat * delta_t / 1000  # kW
+        load = total_infiltration_flow * air_density * specific_heat * delta_t / 1000
         cooling_load = load if mode == "cooling" else 0
         heating_load = -load if mode == "heating" else 0
         return cooling_load, heating_load
@@ -674,25 +482,25 @@ class TFMCalculations:
         """Calculate adaptive comfort temperature per ASHRAE 55."""
         if 10 <= outdoor_temp <= 33.5:
             return 0.31 * outdoor_temp + 17.8
-        return 24.0  # Default to standard setpoint if outside range
+        return 24.0
 
     @staticmethod
     def filter_hourly_data(hourly_data: List[Dict], sim_period: Dict, climate_data: Dict) -> List[Dict]:
-        """Filter hourly data based on simulation period, ignoring year."""
-        if sim_period["type"] == "Full Year":
+        """Filter hourly data based on simulation period."""
+        if sim_period.get("type") == "Full Year":
             return hourly_data
         filtered_data = []
-        if sim_period["type"] == "From-to":
-            start_month = sim_period["start_date"].month
-            start_day = sim_period["start_date"].day
-            end_month = sim_period["end_date"].month
-            end_day = sim_period["end_date"].day
+        if sim_period.get("type") == "From-to":
+            start_month = sim_period.get("start_date", {}).get("month", 1)
+            start_day = sim_period.get("start_date", {}).get("day", 1)
+            end_month = sim_period.get("end_date", {}).get("month", 12)
+            end_day = sim_period.get("end_date", {}).get("day", 31)
             for data in hourly_data:
                 month, day = data["month"], data["day"]
                 if (month > start_month or (month == start_month and day >= start_day)) and \
                    (month < end_month or (month == end_month and day <= end_day)):
                     filtered_data.append(data)
-        elif sim_period["type"] in ["HDD", "CDD"]:
+        elif sim_period.get("type") in ["HDD", "CDD"]:
             base_temp = sim_period.get("base_temp", 18.3 if sim_period["type"] == "HDD" else 23.9)
             for data in hourly_data:
                 temp = data["dry_bulb"]
@@ -701,23 +509,23 @@ class TFMCalculations:
         return filtered_data
 
     @staticmethod
-    def get_indoor_conditions(indoor_conditions: Dict, hour: int, outdoor_temp: float) -> Dict:
+    def get_indoor_conditions(indoor_conditions: Dict, hour: int, outdoor_temp: float, building_info: Dict) -> Dict:
         """Determine indoor conditions based on user settings."""
-        if indoor_conditions["type"] == "Fixed":
+        if indoor_conditions.get("type") == "Fixed":
             mode = "none" if abs(outdoor_temp - 18) < 0.01 else "cooling" if outdoor_temp > 18 else "heating"
             if mode == "cooling":
                 return {
-                    "temperature": indoor_conditions.get("cooling_setpoint", {}).get("temperature", 24.0),
-                    "rh": indoor_conditions.get("cooling_setpoint", {}).get("rh", 50.0)
+                    "temperature": building_info.get("summer_indoor_design_temp", 24.0),
+                    "rh": building_info.get("summer_indoor_design_rh", 50.0)
                 }
             elif mode == "heating":
                 return {
-                    "temperature": indoor_conditions.get("heating_setpoint", {}).get("temperature", 22.0),
-                    "rh": indoor_conditions.get("heating_setpoint", {}).get("rh", 50.0)
+                    "temperature": building_info.get("winter_indoor_design_temp", 22.0),
+                    "rh": building_info.get("winter_indoor_design_rh", 50.0)
                 }
             else:
                 return {"temperature": 24.0, "rh": 50.0}
-        elif indoor_conditions["type"] == "Time-varying":
+        elif indoor_conditions.get("type") == "Time-varying":
             schedule = indoor_conditions.get("schedule", [])
             if schedule:
                 hour_idx = hour % 24
@@ -730,20 +538,18 @@ class TFMCalculations:
 
     @staticmethod
     def calculate_tfm_loads(components: Dict, hourly_data: List[Dict], indoor_conditions: Dict, internal_loads: Dict, building_info: Dict, sim_period: Dict, hvac_settings: Dict) -> List[Dict]:
-        """Calculate TFM loads for heating and cooling with user-defined filters and temperature threshold."""
+        """Calculate TFM loads for heating and cooling."""
         filtered_data = TFMCalculations.filter_hourly_data(hourly_data, sim_period, building_info)
         temp_loads = []
         building_orientation = building_info.get("orientation_angle", 0.0)
         operating_periods = hvac_settings.get("operating_hours", [{"start": 8, "end": 18}])
         area = building_info.get("floor_area", 100.0)
-        
-        # Ensure MaterialLibrary is properly initialized
+
         if "material_library" not in st.session_state:
-            from data.material_library import MaterialLibrary
             st.session_state.material_library = MaterialLibrary()
-            logger.info("Initialized MaterialLibrary in session_state for solar calculations")
-        
-        # Pre-calculate CTF coefficients for all components using CTFCalculator
+            logger.info("Initialized MaterialLibrary in session_state")
+
+        # Pre-calculate CTF coefficients
         for comp_list in components.values():
             for comp in comp_list:
                 comp.ctf = CTFCalculator.calculate_ctf_coefficients(comp)
@@ -751,34 +557,19 @@ class TFMCalculations:
         for hour_data in filtered_data:
             hour = hour_data["hour"]
             outdoor_temp = hour_data["dry_bulb"]
-            indoor_cond = TFMCalculations.get_indoor_conditions(indoor_conditions, hour, outdoor_temp)
+            indoor_cond = TFMCalculations.get_indoor_conditions(indoor_conditions, hour, outdoor_temp, building_info)
             indoor_temp = indoor_cond["temperature"]
-            # Initialize all loads to 0
+
             conduction_cooling = conduction_heating = solar = internal = ventilation_cooling = ventilation_heating = infiltration_cooling = infiltration_heating = 0
-            # Check if hour is within operating periods
-            is_operating = False
-            for period in operating_periods:
-                start_hour = period.get("start", 8)
-                end_hour = period.get("end", 18)
-                if start_hour <= hour % 24 <= end_hour:
-                    is_operating = True
-                    break
-            # Determine mode based on temperature threshold (18°C)
+            is_operating = any(period["start"] <= hour % 24 <= period["end"] for period in operating_periods)
             mode = "none" if abs(outdoor_temp - 18) < 0.01 else "cooling" if outdoor_temp > 18 else "heating"
+
             if is_operating and mode == "cooling":
-                # Calculate solar load for each component and accumulate
                 for comp_list in components.values():
                     for comp in comp_list:
                         cool_load, _ = TFMCalculations.calculate_conduction_load(comp, outdoor_temp, indoor_temp, hour, mode="cooling")
                         conduction_cooling += cool_load
-                        
-                        # Calculate solar load for each component and accumulate
-                        component_solar_load = TFMCalculations.calculate_solar_load(comp, hour_data, hour, building_orientation, mode="cooling")
-                        solar += component_solar_load
-                        
-                        # Add detailed logging for solar load accumulation
-                        logger.info(f"Component {comp.name} ({comp.component_type.value}) solar load: {component_solar_load:.3f} kW, accumulated solar: {solar:.3f} kW")
-                
+                        solar += TFMCalculations.calculate_solar_load(comp, hour_data, hour, building_orientation, mode="cooling")
                 internal = TFMCalculations.calculate_internal_load(internal_loads, hour, max([p["end"] - p["start"] for p in operating_periods]), area)
                 ventilation_cooling, _ = TFMCalculations.calculate_ventilation_load(internal_loads, outdoor_temp, indoor_temp, area, building_info, mode="cooling")
                 infiltration_cooling, _ = TFMCalculations.calculate_infiltration_load(internal_loads, outdoor_temp, indoor_temp, area, building_info, mode="cooling")
@@ -790,20 +581,18 @@ class TFMCalculations:
                 internal = TFMCalculations.calculate_internal_load(internal_loads, hour, max([p["end"] - p["start"] for p in operating_periods]), area)
                 _, ventilation_heating = TFMCalculations.calculate_ventilation_load(internal_loads, outdoor_temp, indoor_temp, area, building_info, mode="heating")
                 _, infiltration_heating = TFMCalculations.calculate_infiltration_load(internal_loads, outdoor_temp, indoor_temp, area, building_info, mode="heating")
-            else:  # mode == "none" or not is_operating
-                internal = 0  # No internal loads when no heating or cooling is needed or outside operating hours
-            
-            # Add detailed logging for total loads
+            else:
+                internal = 0
+
             logger.info(f"Hour {hour} total loads - conduction: {conduction_cooling:.3f} kW, solar: {solar:.3f} kW, internal: {internal:.3f} kW")
             
-            # Calculate total loads, subtracting internal load for heating
             total_cooling = conduction_cooling + solar + internal + ventilation_cooling + infiltration_cooling
             total_heating = max(conduction_heating + ventilation_heating + infiltration_heating - internal, 0)
-            # Enforce mutual exclusivity within hour
             if mode == "cooling":
                 total_heating = 0
             elif mode == "heating":
                 total_cooling = 0
+
             temp_loads.append({
                 "hour": hour,
                 "month": hour_data["month"],
@@ -819,24 +608,80 @@ class TFMCalculations:
                 "total_cooling": total_cooling,
                 "total_heating": total_heating
             })
-        # Group loads by day and apply daily control
+
         loads_by_day = defaultdict(list)
         for load in temp_loads:
             day_key = (load["month"], load["day"])
             loads_by_day[day_key].append(load)
         final_loads = []
         for day_key, day_loads in loads_by_day.items():
-            # Count hours with non-zero cooling and heating loads
             cooling_hours = sum(1 for load in day_loads if load["total_cooling"] > 0)
             heating_hours = sum(1 for load in day_loads if load["total_heating"] > 0)
-            # Apply daily control
             for load in day_loads:
                 if cooling_hours > heating_hours:
-                    load["total_heating"] = 0  # Keep cooling components, zero heating total
+                    load["total_heating"] = 0
                 elif heating_hours > cooling_hours:
-                    load["total_cooling"] = 0  # Keep heating components, zero cooling total
-                else:  # Equal hours
                     load["total_cooling"] = 0
-                    load["total_heating"] = 0  # Zero both totals, keep components
+                else:
+                    load["total_cooling"] = 0
+                    load["total_heating"] = 0
                 final_loads.append(load)
-        return final_loads
+        return final_loads
+
+def display_hvac_loads_page():
+    """Display the HVAC Loads page and manage calculations."""
+    st.title("HVAC Loads")
+    st.markdown("Calculate cooling and heating loads based on ASHRAE methodology.")
+
+    project_data = st.session_state.project_data
+    components = project_data.get("components", {})
+    climate_data = project_data.get("climate_data", {})
+    internal_loads = project_data.get("internal_loads", {})
+    building_info = project_data.get("building_info", {})
+    sim_period = climate_data.get("typical_extreme_periods", {"type": "Full Year"})
+    indoor_conditions = {"type": "Fixed"}  # Default, can be extended with UI
+    hvac_settings = project_data.get("hvac_loads", {}).get("settings", {"operating_hours": [{"start": 8, "end": 18}]})
+
+    if not climate_data.get("hourly_data"):
+        st.warning("Please upload climate data in the Climate Data page.")
+        return
+
+    if not any(components.values()):
+        st.warning("Please define building components in the Building Components page.")
+        return
+
+    if st.button("Calculate HVAC Loads"):
+        loads = TFMCalculations.calculate_tfm_loads(
+            components, climate_data["hourly_data"], indoor_conditions,
+            internal_loads, building_info, sim_period, hvac_settings
+        )
+        
+        # Update session state
+        project_data["hvac_loads"]["cooling"]["hourly"] = [load for load in loads if load["total_cooling"] > 0]
+        project_data["hvac_loads"]["heating"]["hourly"] = [load for load in loads if load["total_heating"] > 0]
+        project_data["hvac_loads"]["cooling"]["peak"] = max((load["total_cooling"] for load in loads), default=0)
+        project_data["hvac_loads"]["heating"]["peak"] = max((load["total_heating"] for load in loads), default=0)
+
+        # Generate summary tables and charts
+        cooling_df = pd.DataFrame(project_data["hvac_loads"]["cooling"]["hourly"])
+        heating_df = pd.DataFrame(project_data["hvac_loads"]["heating"]["hourly"])
+        
+        if not cooling_df.empty:
+            st.subheader("Cooling Loads")
+            st.dataframe(cooling_df[["month", "day", "hour", "total_cooling", "conduction_cooling", "solar", "internal", "ventilation_cooling", "infiltration_cooling"]])
+            project_data["hvac_loads"]["cooling"]["summary_tables"] = {"hourly_summary": cooling_df.to_dict()}
+        
+        if not heating_df.empty:
+            st.subheader("Heating Loads")
+            st.dataframe(heating_df[["month", "day", "hour", "total_heating", "conduction_heating", "internal", "ventilation_heating", "infiltration_heating"]])
+            project_data["hvac_loads"]["heating"]["summary_tables"] = {"hourly_summary": heating_df.to_dict()}
+
+        # Trigger rerun if needed
+        if "hvac_loads_rerun_pending" not in st.session_state:
+            st.session_state.hvac_loads_rerun_pending = False
+        if st.session_state.hvac_loads_rerun_pending:
+            st.session_state.hvac_loads_rerun_pending = False
+            st.rerun()
+
+if __name__ == "__main__":
+    display_hvac_loads_page()