Update app/hvac_loads.py

app/hvac_loads.py

@@ -1150,476 +1150,486 @@ def display_hvac_results_ui(loads: List[Dict[str, Any]], run_id: str = "default"
 def display_hvac_loads_page():
     """
     Display the HVAC Loads page in the Streamlit application.
-    Checks for existing results in session state before recalculating.
-    Clears previous results when a new simulation is run.
+    Organizes input configuration and results in separate tabs, with clearing and updating of session state.
     """
     try:
         st.header("HVAC Loads")
         st.markdown("Configure and calculate HVAC loads for the building.")
 
-        # Initialize hvac_loads in project_data if not present
-        if "hvac_loads" not in st.session_state.project_data:
-            st.session_state.project_data["hvac_loads"] = {
-                "cooling": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}},
-                "heating": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}}
-            }
-
-        # Generate a unique run ID for this session
-        run_id = str(uuid.uuid4())
-
-        # Check for existing results
-        loads = []
-        if st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] or \
-           st.session_state.project_data["hvac_loads"]["heating"]["hourly"]:
-            loads = (
-                st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] +
-                st.session_state.project_data["hvac_loads"]["heating"]["hourly"]
-            )
-            # Sort loads by month, day, hour to ensure consistent display
-            loads = sorted(loads, key=lambda x: (x["month"], x["day"], x["hour"]))
-            if loads:
-                st.info("Displaying previously calculated HVAC load results.")
-                display_hvac_results_ui(loads, run_id=run_id)
-
-        # Location Information
-        st.subheader("Location Information")
-        climate_data = st.session_state.project_data["climate_data"]
-        location_data = {
-            "Country": climate_data.get("location", {}).get("country", ""),
-            "City": climate_data.get("location", {}).get("city", ""),
-            "State/Province": climate_data.get("location", {}).get("state_province", ""),
-            "Latitude": climate_data.get("location", {}).get("latitude", 0.0),
-            "Longitude": climate_data.get("location", {}).get("longitude", 0.0),
-            "Elevation": climate_data.get("location", {}).get("elevation", 0.0),
-            "Time Zone": climate_data.get("location", {}).get("timezone", "UTC"),
-            "Ground Reflectivity": climate_data.get("ground_reflectivity", 0.2)
-        }
-        
-        # Create two rows with four columns each
-        col1, col2, col3, col4 = st.columns(4)
-        with col1:
-            country = st.text_input("Country", value=location_data["Country"], key="hvac_country")
-        with col2:
-            city = st.text_input("City", value=location_data["City"], key="hvac_city")
-        with col3:
-            state_province = st.text_input("State/Province", value=location_data["State/Province"], key="hvac_state_province")
-        with col4:
-            latitude = st.number_input(
-                "Latitude (°)",
-                min_value=-90.0,
-                max_value=90.0,
-                value=location_data["Latitude"],
-                step=0.1,
-                key="hvac_latitude"
+        # Notify if HVAC load data exists in session state
+        if (
+            st.session_state.project_data.get("hvac_loads", {}).get("cooling", {}).get("hourly")
+            or st.session_state.project_data.get("hvac_loads", {}).get("heating", {}).get("hourly")
+        ):
+            st.info(
+                f"HVAC load results already calculated. "
+                f"View details in the 'HVAC Load Results' tab or configure new calculations below."
             )
-        
-        col5, col6, col7, col8 = st.columns(4)
-        with col5:
-            longitude = st.number_input(
-                "Longitude (°)",
-                min_value=-180.0,
-                max_value=180.0,
-                value=location_data["Longitude"],
-                step=0.1,
-                key="hvac_longitude"
-            )
-        with col6:
-            elevation = st.number_input(
-                "Elevation (m)",
-                min_value=0.0,
-                max_value=10000.0,
-                value=location_data["Elevation"],
-                step=1.0,
-                key="hvac_elevation"
-            )
-        with col7:
-            timezone = st.number_input(
-                "Time Zone (UTC offset)",
-                min_value=-12.0,
-                max_value=14.0,
-                value=float(location_data["Time Zone"]) if isinstance(location_data["Time Zone"], (int, float, str)) else 0.0,
-                step=0.5,
-                key="hvac_timezone"
-            )
-        with col8:
-            ground_reflectivity = st.number_input(
-                "Ground Reflectivity",
-                min_value=0.0,
-                max_value=1.0,
-                value=location_data["Ground Reflectivity"],
-                step=0.01,
-                key="hvac_ground_reflectivity"
-            )
-        
-        if st.button("Save Location"):
-            st.session_state.project_data["climate_data"]["location"].update({
-                "country": country,
-                "city": city,
-                "state_province": state_province,
-                "latitude": latitude,
-                "longitude": longitude,
-                "elevation": elevation,
-                "timezone": timezone
-            })
-            st.session_state.project_data["climate_data"]["ground_reflectivity"] = ground_reflectivity
-            st.success("Location information saved successfully.")
-            logger.info("Location information updated in session state")
-
-        # Simulation Period Configuration
-        st.subheader("Simulation Period")
-        sim_type = st.selectbox(
-            "Simulation Type",
-            ["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
-             "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"],
-            key="hvac_sim_type",
-            index=["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
-                   "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"].index(
-                       st.session_state.project_data["sim_period"]["type"]
-                   ) if st.session_state.project_data["sim_period"]["type"] in 
-                   ["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
-                    "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"] else 0
-        )
-        st.session_state.project_data["sim_period"]["type"] = sim_type
 
-        if sim_type == "From Date to Date":
-            col1, col2 = st.columns(2)
+        # Create tabs for input and results
+        tab1, tab2 = st.tabs(["HVAC Load Input", "HVAC Load Results"])
+
+        # HVAC Load Input tab
+        with tab1:
+            # Generate a unique run ID for this session
+            import uuid
+            run_id = str(uuid.uuid4())
+
+            # Location Information
+            st.subheader("Location Information")
+            climate_data = st.session_state.project_data["climate_data"]
+            location_data = {
+                "Country": climate_data.get("location", {}).get("country", ""),
+                "City": climate_data.get("location", {}).get("city", ""),
+                "State/Province": climate_data.get("location", {}).get("state_province", ""),
+                "Latitude": climate_data.get("location", {}).get("latitude", 0.0),
+                "Longitude": climate_data.get("location", {}).get("longitude", 0.0),
+                "Elevation": climate_data.get("location", {}).get("elevation", 0.0),
+                "Time Zone": climate_data.get("location", {}).get("timezone", "UTC"),
+                "Ground Reflectivity": climate_data.get("ground_reflectivity", 0.2)
+            }
+
+            # Create two rows with four columns each
+            col1, col2, col3, col4 = st.columns(4)
             with col1:
-                start_date = st.date_input(
-                    "Start Date",
-                    value=st.session_state.project_data["sim_period"]["start_date"] or datetime(2025, 1, 1),
-                    key="hvac_start_date"
-                )
+                country = st.text_input("Country", value=location_data["Country"], key="hvac_country")
             with col2:
-                end_date = st.date_input(
-                    "End Date",
-                    value=st.session_state.project_data["sim_period"]["end_date"] or datetime(2025, 12, 31),
-                    key="hvac_end_date"
+                city = st.text_input("City", value=location_data["City"], key="hvac_city")
+            with col3:
+                state_province = st.text_input("State/Province", value=location_data["State/Province"], key="hvac_state_province")
+            with col4:
+                latitude = st.number_input(
+                    "Latitude (°)",
+                    min_value=-90.0,
+                    max_value=90.0,
+                    value=location_data["Latitude"],
+                    step=0.1,
+                    key="hvac_latitude"
                 )
-            st.session_state.project_data["sim_period"]["start_date"] = start_date
-            st.session_state.project_data["sim_period"]["end_date"] = end_date
-        elif sim_type in ["Heating Only", "Cooling Only"]:
-            base_temp = st.number_input(
-                "Base Temperature (°C)",
-                min_value=0.0,
-                max_value=40.0,
-                value=st.session_state.project_data["sim_period"].get("base_temp", 18.3 if sim_type == "Heating Only" else 23.9),
-                step=0.1,
-                key="hvac_base_temp"
-            )
-            st.session_state.project_data["sim_period"]["base_temp"] = base_temp
-
-        # Indoor Conditions Configuration
-        st.subheader("Indoor Conditions")
-        indoor_type = st.selectbox(
-            "Indoor Conditions Type",
-            ["Fixed Setpoints", "ASHRAE 55 Adaptive Comfort"],
-            key="hvac_indoor_type",
-            index=["Fixed Setpoints", "ASHRAE 55 Adaptive Comfort"].index(st.session_state.project_data["indoor_conditions"]["type"])
-        )
-        st.session_state.project_data["indoor_conditions"]["type"] = indoor_type
-        
-        if indoor_type == "Fixed Setpoints":
-            col1, col2 = st.columns(2)
-            with col1:
-                cooling_temp = st.number_input(
-                    "Cooling Setpoint Temperature (°C)",
-                    min_value=18.0,
-                    max_value=30.0,
-                    value=st.session_state.project_data["indoor_conditions"]["cooling_setpoint"]["temperature"],
+
+            col5, col6, col7, col8 = st.columns(4)
+            with col5:
+                longitude = st.number_input(
+                    "Longitude (°)",
+                    min_value=-180.0,
+                    max_value=180.0,
+                    value=location_data["Longitude"],
                     step=0.1,
-                    key="hvac_cooling_temp"
+                    key="hvac_longitude"
                 )
-                cooling_rh = st.number_input(
-                    "Cooling Setpoint Relative Humidity (%)",
-                    min_value=30.0,
-                    max_value=70.0,
-                    value=st.session_state.project_data["indoor_conditions"]["cooling_setpoint"]["rh"],
+            with col6:
+                elevation = st.number_input(
+                    "Elevation (m)",
+                    min_value=0.0,
+                    max_value=10000.0,
+                    value=location_data["Elevation"],
                     step=1.0,
-                    key="hvac_cooling_rh"
+                    key="hvac_elevation"
                 )
-            with col2:
-                heating_temp = st.number_input(
-                    "Heating Setpoint Temperature (°C)",
-                    min_value=16.0,
-                    max_value=26.0,
-                    value=st.session_state.project_data["indoor_conditions"]["heating_setpoint"]["temperature"],
-                    step=0.1,
-                    key="hvac_heating_temp"
+            with col7:
+                timezone = st.number_input(
+                    "Time Zone (UTC offset)",
+                    min_value=-12.0,
+                    max_value=14.0,
+                    value=float(location_data["Time Zone"]) if isinstance(location_data["Time Zone"], (int, float, str)) else 0.0,
+                    step=0.5,
+                    key="hvac_timezone"
                 )
-                heating_rh = st.number_input(
-                    "Heating Setpoint Relative Humidity (%)",
-                    min_value=30.0,
-                    max_value=70.0,
-                    value=st.session_state.project_data["indoor_conditions"]["heating_setpoint"]["rh"],
-                    step=1.0,
-                    key="hvac_heating_rh"
+            with col8:
+                ground_reflectivity = st.number_input(
+                    "Ground Reflectivity",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=location_data["Ground Reflectivity"],
+                    step=0.01,
+                    key="hvac_ground_reflectivity"
                 )
-            st.session_state.project_data["indoor_conditions"]["cooling_setpoint"] = {
-                "temperature": cooling_temp,
-                "rh": cooling_rh
-            }
-            st.session_state.project_data["indoor_conditions"]["heating_setpoint"] = {
-                "temperature": heating_temp,
-                "rh": heating_rh
-            }
-        elif indoor_type == "ASHRAE 55 Adaptive Comfort":
-            acceptability = st.selectbox(
-                "Adaptive Comfort Acceptability (%)",
-                ["80", "85", "90", "95"],
-                index=["80", "85", "90", "95"].index(st.session_state.project_data["indoor_conditions"].get("adaptive_acceptability", "90")),
-                key="adaptive_acceptability"
-            )
-            st.session_state.project_data["indoor_conditions"]["adaptive_acceptability"] = acceptability
-        
-        # Internal Loads Conditions Configuration
-        st.subheader("Internal Loads Conditions")
-        col1, col2, col3, col4, col5 = st.columns(5)
-        
-        # Initialize internal_loads_conditions if not present
-        if "internal_loads_conditions" not in st.session_state.project_data:
-            st.session_state.project_data["internal_loads_conditions"] = {
-                "air_velocity": 0.1,
-                "lighting_convective_fraction": 0.5,
-                "lighting_radiative_fraction": 0.5,
-                "equipment_convective_fraction": 0.5,
-                "equipment_radiative_fraction": 0.5
-            }
-        
-        # Retrieve internal loads data
-        internal_loads = st.session_state.project_data.get("internal_loads", {})
-        lighting_systems = internal_loads.get("lighting", [])
-        equipment_systems = internal_loads.get("equipment", [])
-        
-        # Calculate default lighting fractions from lighting systems
-        if lighting_systems:
-            lighting_convective_avg = sum(system.get("convective_fraction", 0.5) for system in lighting_systems) / len(lighting_systems)
-            lighting_radiative_avg = sum(system.get("radiative_fraction", 0.5) for system in lighting_systems) / len(lighting_systems)
-        else:
-            lighting_convective_avg = st.session_state.project_data["internal_loads_conditions"].get("lighting_convective_fraction", 0.5)
-            lighting_radiative_avg = st.session_state.project_data["internal_loads_conditions"].get("lighting_radiative_fraction", 0.5)
-        
-        # Calculate default equipment fractions from equipment systems
-        if equipment_systems:
-            equipment_convective_avg = sum(system.get("convective_fraction", 0.5) for system in equipment_systems) / len(equipment_systems)
-            equipment_radiative_avg = sum(system.get("radiative_fraction", 0.5) for system in equipment_systems) / len(equipment_systems)
-        else:
-            equipment_convective_avg = st.session_state.project_data["internal_loads_conditions"].get("equipment_convective_fraction", 0.5)
-            equipment_radiative_avg = st.session_state.project_data["internal_loads_conditions"].get("equipment_radiative_fraction", 0.5)
-        
-        with col1:
-            air_velocity = st.number_input(
-                "Air Velocity (m/s)",
-                min_value=0.0,
-                max_value=2.0,
-                value=st.session_state.project_data["internal_loads_conditions"].get("air_velocity", 0.1),
-                step=0.01,
-                key="hvac_air_velocity"
-            )
-            if air_velocity < 0.0 or air_velocity > 2.0:
-                st.error("Air velocity must be between 0 and 2 m/s.")
-                air_velocity = max(0.0, min(2.0, air_velocity))
-        
-        with col2:
-            lighting_convective_fraction = st.number_input(
-                "Lighting Convective Fraction",
-                min_value=0.0,
-                max_value=1.0,
-                value=lighting_convective_avg,
-                step=0.01,
-                key="hvac_lighting_convective"
-            )
-        
-        with col3:
-            lighting_radiative_fraction = st.number_input(
-                "Lighting Radiative Fraction",
-                min_value=0.0,
-                max_value=1.0,
-                value=lighting_radiative_avg,
-                step=0.01,
-                key="hvac_lighting_radiative"
-            )
-            # Validate lighting fractions sum to 1.0
-            if abs(lighting_convective_fraction + lighting_radiative_fraction - 1.0) > 0.01:
-                st.error("Lighting convective and radiative fractions must sum to 1.0.")
-                lighting_radiative_fraction = 1.0 - lighting_convective_fraction  # Auto-correct radiative fraction
-                st.warning(f"Adjusted Lighting Radiative Fraction to {lighting_radiative_fraction:.2f} to ensure sum equals 1.0.")
-        
-        with col4:
-            equipment_convective_fraction = st.number_input(
-                "Equipment Convective Fraction",
-                min_value=0.0,
-                max_value=1.0,
-                value=equipment_convective_avg,
-                step=0.01,
-                key="hvac_equipment_convective"
-            )
-        
-        with col5:
-            equipment_radiative_fraction = st.number_input(
-                "Equipment Radiative Fraction",
-                min_value=0.0,
-                max_value=1.0,
-                value=equipment_radiative_avg,
-                step=0.01,
-                key="hvac_equipment_radiative"
+
+            if st.button("Save Location"):
+                st.session_state.project_data["climate_data"]["location"].update({
+                    "country": country,
+                    "city": city,
+                    "state_province": state_province,
+                    "latitude": latitude,
+                    "longitude": longitude,
+                    "elevation": elevation,
+                    "timezone": timezone
+                })
+                st.session_state.project_data["climate_data"]["ground_reflectivity"] = ground_reflectivity
+                st.success("Location information saved successfully.")
+                logger.info("Location information updated in session state")
+
+            # Simulation Period Configuration
+            st.subheader("Simulation Period")
+            sim_type = st.selectbox(
+                "Simulation Type",
+                ["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
+                 "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"],
+                key="hvac_sim_type",
+                index=["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
+                       "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"].index(
+                           st.session_state.project_data["sim_period"]["type"]
+                       ) if st.session_state.project_data["sim_period"]["type"] in 
+                       ["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
+                        "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"] else 0
             )
-            # Validate equipment fractions sum to 1.0
-            if abs(equipment_convective_fraction + equipment_radiative_fraction - 1.0) > 0.01:
-                st.error("Equipment convective and radiative fractions must sum to 1.0.")
-                equipment_radiative_fraction = 1.0 - equipment_convective_fraction  # Auto-correct radiative fraction
-                st.warning(f"Adjusted Equipment Radiative Fraction to {equipment_radiative_fraction:.2f} to ensure sum equals 1.0.")
-        
-        if st.button("Save Internal Loads Conditions"):
-            # Update internal loads conditions in session state
-            st.session_state.project_data["internal_loads_conditions"].update({
-                "air_velocity": air_velocity,
-                "lighting_convective_fraction": lighting_convective_fraction,
-                "lighting_radiative_fraction": lighting_radiative_fraction,
-                "equipment_convective_fraction": equipment_convective_fraction,
-                "equipment_radiative_fraction": equipment_radiative_fraction
-            })
-            # Update lighting systems with new fractions
-            for system in lighting_systems:
-                system["convective_fraction"] = lighting_convective_fraction
-                system["radiative_fraction"] = lighting_radiative_fraction
-            # Update equipment systems with new fractions
-            for system in equipment_systems:
-                system["convective_fraction"] = equipment_convective_fraction
-                system["radiative_fraction"] = equipment_radiative_fraction
-            st.success("Internal loads conditions saved successfully.")
-            logger.info("Internal loads conditions updated in session state.")
-
-        # Ground Temperature Configuration
-        st.subheader("Ground Temperature Configuration")
-        has_ground_contact = any(
-            comp.get('ground_contact', False)
-            for comp_list in st.session_state.project_data["components"].values()
-            for comp in comp_list
-        )
-        if has_ground_contact:
-            st.markdown("Configure monthly ground temperatures for components in contact with the ground (e.g., floors, walls, roofs). Typical ranges are 10–20°C at 2 m depth (ASHRAE Fundamentals, Chapter 18).")
-            
-            depth_options = ["0.5", "2", "4"]
-            default_depth = "2"
-            selected_depth = st.selectbox(
-                "Ground Temperature Depth (m)",
-                options=depth_options,
-                index=depth_options.index(default_depth),
-                key="ground_temp_depth"
+            st.session_state.project_data["sim_period"]["type"] = sim_type
+
+            if sim_type == "From Date to Date":
+                col1, col2 = st.columns(2)
+                with col1:
+                    start_date = st.date_input(
+                        "Start Date",
+                        value=st.session_state.project_data["sim_period"]["start_date"] or datetime(2025, 1, 1),
+                        key="hvac_start_date"
+                    )
+                with col2:
+                    end_date = st.date_input(
+                        "End Date",
+                        value=st.session_state.project_data["sim_period"]["end_date"] or datetime(2025, 12, 31),
+                        key="hvac_end_date"
+                    )
+                st.session_state.project_data["sim_period"]["start_date"] = start_date
+                st.session_state.project_data["sim_period"]["end_date"] = end_date
+            elif sim_type in ["Heating Only", "Cooling Only"]:
+                base_temp = st.number_input(
+                    "Base Temperature (°C)",
+                    min_value=0.0,
+                    max_value=40.0,
+                    value=st.session_state.project_data["sim_period"].get("base_temp", 18.3 if sim_type == "Heating Only" else 23.9),
+                    step=0.1,
+                    key="hvac_base_temp"
+                )
+                st.session_state.project_data["sim_period"]["base_temp"] = base_temp
+
+            # Indoor Conditions Configuration
+            st.subheader("Indoor Conditions")
+            indoor_type = st.selectbox(
+                "Indoor Conditions Type",
+                ["Fixed Setpoints", "ASHRAE 55 Adaptive Comfort"],
+                key="hvac_indoor_type",
+                index=["Fixed Setpoints", "ASHRAE 55 Adaptive Comfort"].index(st.session_state.project_data["indoor_conditions"]["type"])
             )
-            
-            climate_data = st.session_state.project_data.get("climate_data", {})
-            ground_temperatures = climate_data.get("ground_temperatures", {})
-            default_temps = {"0.5": [20.0]*12, "2": [18.0]*12, "4": [16.0]*12}
-            
-            if selected_depth not in ground_temperatures or not ground_temperatures[selected_depth]:
-                st.warning(f"No ground temperature data available for depth {selected_depth} m. Using default temperatures: {default_temps[selected_depth][0]}°C.")
-                monthly_temps = default_temps[selected_depth]
-            else:
-                monthly_temps = ground_temperatures[selected_depth]
-            
-            st.write("Enter monthly ground temperatures (°C):")
-            months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-            temp_inputs = []
-            cols = st.columns(12)
-            for i, month in enumerate(months):
-                with cols[i]:
-                    temp = st.number_input(
-                        month,
-                        min_value=-20.0,
-                        max_value=40.0,
-                        value=monthly_temps[i],
+            st.session_state.project_data["indoor_conditions"]["type"] = indoor_type
+
+            if indoor_type == "Fixed Setpoints":
+                col1, col2 = st.columns(2)
+                with col1:
+                    cooling_temp = st.number_input(
+                        "Cooling Setpoint Temperature (°C)",
+                        min_value=18.0,
+                        max_value=30.0,
+                        value=st.session_state.project_data["indoor_conditions"]["cooling_setpoint"]["temperature"],
                         step=0.1,
-                        key=f"ground_temp_{selected_depth}_{month}"
+                        key="hvac_cooling_temp"
                     )
-                    temp_inputs.append(temp)
-            
-            if st.button("Save Ground Temperatures"):
-                if len(temp_inputs) != 12:
-                    st.error("Please provide temperatures for all 12 months.")
-                elif any(not -20.0 <= t <= 40.0 for t in temp_inputs):
-                    st.error("All temperatures must be between -20°C and 40°C.")
+                    cooling_rh = st.number_input(
+                        "Cooling Setpoint Relative Humidity (%)",
+                        min_value=30.0,
+                        max_value=70.0,
+                        value=st.session_state.project_data["indoor_conditions"]["cooling_setpoint"]["rh"],
+                        step=1.0,
+                        key="hvac_cooling_rh"
+                    )
+                with col2:
+                    heating_temp = st.number_input(
+                        "Heating Setpoint Temperature (°C)",
+                        min_value=16.0,
+                        max_value=26.0,
+                        value=st.session_state.project_data["indoor_conditions"]["heating_setpoint"]["temperature"],
+                        step=0.1,
+                        key="hvac_heating_temp"
+                    )
+                    heating_rh = st.number_input(
+                        "Heating Setpoint Relative Humidity (%)",
+                        min_value=30.0,
+                        max_value=70.0,
+                        value=st.session_state.project_data["indoor_conditions"]["heating_setpoint"]["rh"],
+                        step=1.0,
+                        key="hvac_heating_rh"
+                    )
+                st.session_state.project_data["indoor_conditions"]["cooling_setpoint"] = {
+                    "temperature": cooling_temp,
+                    "rh": cooling_rh
+                }
+                st.session_state.project_data["indoor_conditions"]["heating_setpoint"] = {
+                    "temperature": heating_temp,
+                    "rh": heating_rh
+                }
+            elif indoor_type == "ASHRAE 55 Adaptive Comfort":
+                acceptability = st.selectbox(
+                    "Adaptive Comfort Acceptability (%)",
+                    ["80", "85", "90", "95"],
+                    index=["80", "85", "90", "95"].index(st.session_state.project_data["indoor_conditions"].get("adaptive_acceptability", "90")),
+                    key="adaptive_acceptability"
+                )
+                st.session_state.project_data["indoor_conditions"]["adaptive_acceptability"] = acceptability
+
+            # Internal Loads Conditions Configuration
+            st.subheader("Internal Loads Conditions")
+            col1, col2, col3, col4, col5 = st.columns(5)
+
+            # Initialize internal_loads_conditions if not present
+            if "internal_loads_conditions" not in st.session_state.project_data:
+                st.session_state.project_data["internal_loads_conditions"] = {
+                    "air_velocity": 0.1,
+                    "lighting_convective_fraction": 0.5,
+                    "lighting_radiative_fraction": 0.5,
+                    "equipment_convective_fraction": 0.5,
+                    "equipment_radiative_fraction": 0.5
+                }
+
+            # Retrieve internal loads data
+            internal_loads = st.session_state.project_data.get("internal_loads", {})
+            lighting_systems = internal_loads.get("lighting", [])
+            equipment_systems = internal_loads.get("equipment", [])
+
+            # Calculate default lighting fractions from lighting systems
+            if lighting_systems:
+                lighting_convective_avg = sum(system.get("convective_fraction", 0.5) for system in lighting_systems) / len(lighting_systems)
+                lighting_radiative_avg = sum(system.get("radiative_fraction", 0.5) for system in lighting_systems) / len(lighting_systems)
+            else:
+                lighting_convective_avg = st.session_state.project_data["internal_loads_conditions"].get("lighting_convective_fraction", 0.5)
+                lighting_radiative_avg = st.session_state.project_data["internal_loads_conditions"].get("lighting_radiative_fraction", 0.5)
+
+            # Calculate default equipment fractions from equipment systems
+            if equipment_systems:
+                equipment_convective_avg = sum(system.get("convective_fraction", 0.5) for system in equipment_systems) / len(equipment_systems)
+                equipment_radiative_avg = sum(system.get("radiative_fraction", 0.5) for system in equipment_systems) / len(equipment_systems)
+            else:
+                equipment_convective_avg = st.session_state.project_data["internal_loads_conditions"].get("equipment_convective_fraction", 0.5)
+                equipment_radiative_avg = st.session_state.project_data["internal_loads_conditions"].get("equipment_radiative_fraction", 0.5)
+
+            with col1:
+                air_velocity = st.number_input(
+                    "Air Velocity (m/s)",
+                    min_value=0.0,
+                    max_value=2.0,
+                    value=st.session_state.project_data["internal_loads_conditions"].get("air_velocity", 0.1),
+                    step=0.01,
+                    key="hvac_air_velocity"
+                )
+                if air_velocity < 0.0 or air_velocity > 2.0:
+                    st.error("Air velocity must be between 0 and 2 m/s.")
+                    air_velocity = max(0.0, min(2.0, air_velocity))
+
+            with col2:
+                lighting_convective_fraction = st.number_input(
+                    "Lighting Convective Fraction",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=lighting_convective_avg,
+                    step=0.01,
+                    key="hvac_lighting_convective"
+                )
+
+            with col3:
+                lighting_radiative_fraction = st.number_input(
+                    "Lighting Radiative Fraction",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=lighting_radiative_avg,
+                    step=0.01,
+                    key="hvac_lighting_radiative"
+                )
+                # Validate lighting fractions sum to 1.0
+                if abs(lighting_convective_fraction + lighting_radiative_fraction - 1.0) > 0.01:
+                    st.error("Lighting convective and radiative fractions must sum to 1.0.")
+                    lighting_radiative_fraction = 1.0 - lighting_convective_fraction  # Auto-correct radiative fraction
+                    st.warning(f"Adjusted Lighting Radiative Fraction to {lighting_radiative_fraction:.2f} to ensure sum equals 1.0.")
+
+            with col4:
+                equipment_convective_fraction = st.number_input(
+                    "Equipment Convective Fraction",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=equipment_convective_avg,
+                    step=0.01,
+                    key="hvac_equipment_convective"
+                )
+
+            with col5:
+                equipment_radiative_fraction = st.number_input(
+                    "Equipment Radiative Fraction",
+                    min_value=0.0,
+                    max_value=1.0,
+                    value=equipment_radiative_avg,
+                    step=0.01,
+                    key="hvac_equipment_radiative"
+                )
+                # Validate equipment fractions sum to 1.0
+                if abs(equipment_convective_fraction + equipment_radiative_fraction - 1.0) > 0.01:
+                    st.error("Equipment convective and radiative fractions must sum to 1.0.")
+                    equipment_radiative_fraction = 1.0 - equipment_convective_fraction  # Auto-correct radiative fraction
+                    st.warning(f"Adjusted Equipment Radiative Fraction to {equipment_radiative_fraction:.2f} to ensure sum equals 1.0.")
+
+            if st.button("Save Internal Loads Conditions"):
+                # Update internal loads conditions in session state
+                st.session_state.project_data["internal_loads_conditions"].update({
+                    "air_velocity": air_velocity,
+                    "lighting_convective_fraction": lighting_convective_fraction,
+                    "lighting_radiative_fraction": lighting_radiative_fraction,
+                    "equipment_convective_fraction": equipment_convective_fraction,
+                    "equipment_radiative_fraction": equipment_radiative_fraction
+                })
+                # Update lighting systems with new fractions
+                for system in lighting_systems:
+                    system["convective_fraction"] = lighting_convective_fraction
+                    system["radiative_fraction"] = lighting_radiative_fraction
+                # Update equipment systems with new fractions
+                for system in equipment_systems:
+                    system["convective_fraction"] = equipment_convective_fraction
+                    system["radiative_fraction"] = equipment_radiative_fraction
+                st.success("Internal loads conditions saved successfully.")
+                logger.info("Internal loads conditions updated in session state.")
+
+            # Ground Temperature Configuration
+            st.subheader("Ground Temperature Configuration")
+            has_ground_contact = any(
+                comp.get('ground_contact', False)
+                for comp_list in st.session_state.project_data["components"].values()
+                for comp in comp_list
+            )
+            if has_ground_contact:
+                st.markdown("Configure monthly ground temperatures for components in contact with the ground (e.g., floors, walls, roofs). Typical ranges are 10–20°C at 2 m depth (ASHRAE Fundamentals, Chapter 18).")
+
+                depth_options = ["0.5", "2", "4"]
+                default_depth = "2"
+                selected_depth = st.selectbox(
+                    "Ground Temperature Depth (m)",
+                    options=depth_options,
+                    index=depth_options.index(default_depth),
+                    key="ground_temp_depth"
+                )
+
+                climate_data = st.session_state.project_data.get("climate_data", {})
+                ground_temperatures = climate_data.get("ground_temperatures", {})
+                default_temps = {"0.5": [20.0]*12, "2": [18.0]*12, "4": [16.0]*12}
+
+                if selected_depth not in ground_temperatures or not ground_temperatures[selected_depth]:
+                    st.warning(f"No ground temperature data available for depth {selected_depth} m. Using default temperatures: {default_temps[selected_depth][0]}°C.")
+                    monthly_temps = default_temps[selected_depth]
                 else:
-                    st.session_state.project_data["climate_data"]["ground_temperatures"][selected_depth] = temp_inputs
-                    st.success(f"Ground temperatures for depth {selected_depth} m saved successfully.")
-                    logger.info(f"Ground temperatures for depth {selected_depth} m updated in session state")
-        else:
-            st.info("No ground-contact components detected. Ground temperature configuration is not required.")        
-        
-        # Calculate HVAC Loads
-        if st.button("Calculate HVAC Loads"):
-            try:
-                with st.spinner("Running simulation... this may take up to a minute depending on data size."):
-                    components = st.session_state.project_data["components"]
-                    hourly_data = st.session_state.project_data["climate_data"]["hourly_data"]
-                    indoor_conditions = st.session_state.project_data["indoor_conditions"]
-                    internal_loads = st.session_state.project_data["internal_loads"]
-                    building_info = st.session_state.project_data["building_info"]
-                    sim_period = st.session_state.project_data["sim_period"]
-                    hvac_settings = st.session_state.project_data["hvac_settings"]
-
-                    if not hourly_data:
-                        st.error("No climate data available. Please configure climate data first.")
-                        logger.error("HVAC calculation failed: No climate data available")
-                        return
-                    elif not any(comp_list for comp_list in components.values()):
-                        st.error("No building components defined. Please configure components first.")
-                        logger.error("HVAC calculation failed: No building components defined")
-                        return
-                    else:
-                        # Clear previous HVAC loads before running new simulation
-                        st.session_state.project_data["hvac_loads"] = {
-                            "cooling": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}},
-                            "heating": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}}
-                        }
-
-                        loads = TFMCalculations.calculate_tfm_loads(
-                            components=components,
-                            hourly_data=hourly_data,
-                            indoor_conditions=indoor_conditions,
-                            internal_loads=internal_loads,
-                            building_info=building_info,
-                            sim_period=sim_period,
-                            hvac_settings=hvac_settings
+                    monthly_temps = ground_temperatures[selected_depth]
+
+                st.write("Enter monthly ground temperatures (°C):")
+                months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+                temp_inputs = []
+                cols = st.columns(12)
+                for i, month in enumerate(months):
+                    with cols[i]:
+                        temp = st.number_input(
+                            month,
+                            min_value=-20.0,
+                            max_value=40.0,
+                            value=monthly_temps[i],
+                            step=0.1,
+                            key=f"ground_temp_{selected_depth}_{month}"
                         )
+                        temp_inputs.append(temp)
 
-                        # Update session state with new results
-                        cooling_loads = [load for load in loads if load["total_cooling"] > 0]
-                        heating_loads = [load for load in loads if load["total_heating"] > 0]
-                        st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] = cooling_loads
-                        st.session_state.project_data["hvac_loads"]["heating"]["hourly"] = heating_loads
-                        st.session_state.project_data["hvac_loads"]["cooling"]["peak"] = max([load["total_cooling"] for load in cooling_loads], default=0)
-                        st.session_state.project_data["hvac_loads"]["heating"]["peak"] = max([load["total_heating"] for load in heating_loads], default=0)
-                        st.session_state.project_data["hvac_loads"]["cooling"]["charts"] = {}
-                        st.session_state.project_data["hvac_loads"]["heating"]["charts"] = {}
-
-                        # Store breakdown
-                        cooling_breakdown = {
-                            "Conduction": sum(load["conduction_cooling"] for load in cooling_loads),
-                            "Solar Gains": sum(load["solar"] for load in cooling_loads),
-                            "Internal": sum(load["internal"] for load in cooling_loads),
-                            "Ventilation Sensible": sum(system.get("sensible_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("ventilation", [])),
-                            "Ventilation Latent": sum(system.get("latent_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("ventilation", [])),
-                            "Infiltration Sensible": sum(system.get("sensible_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("infiltration", [])),
-                            "Infiltration Latent": sum(system.get("latent_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("infiltration", []))
-                        }
-                        heating_breakdown = {
-                            "Conduction": sum(load["conduction_heating"] for load in heating_loads),
-                            "Ventilation": sum(load["ventilation_heating"] for load in heating_loads),
-                            "Infiltration": sum(load["infiltration_heating"] for load in heating_loads)
-                        }
-                        st.session_state.project_data["hvac_loads"]["cooling"]["charts"]["pie_by_component"] = cooling_breakdown
-                        st.session_state.project_data["hvac_loads"]["heating"]["breakdown"] = heating_breakdown
-
-                        # Display Results UI with unique run_id
-                        display_hvac_results_ui(loads, run_id=run_id)
-
-                        st.success("HVAC loads calculated successfully.")
-                        logger.info("HVAC loads calculated and stored in session state")
-
-            except Exception as e:
-                st.error(f"Error calculating HVAC loads: {str(e)}")
-                logger.error(f"HVAC calculation error: {str(e)}")
+                if st.button("Save Ground Temperatures"):
+                    if len(temp_inputs) != 12:
+                        st.error("Please provide temperatures for all 12 months.")
+                    elif any(not -20.0 <= t <= 40.0 for t in temp_inputs):
+                        st.error("All temperatures must be between -20°C and 40°C.")
+                    else:
+                        st.session_state.project_data["climate_data"]["ground_temperatures"][selected_depth] = temp_inputs
+                        st.success(f"Ground temperatures for depth {selected_depth} m saved successfully.")
+                        logger.info(f"Ground temperatures for depth {selected_depth} m updated in session state")
+            else:
+                st.info("No ground-contact components detected. Ground temperature configuration is not required.")
+
+            # Calculate HVAC Loads
+            if st.button("Calculate HVAC Loads"):
+                try:
+                    with st.spinner("Running simulation... this may take up to a minute depending on data size."):
+                        components = st.session_state.project_data["components"]
+                        hourly_data = st.session_state.project_data["climate_data"]["hourly_data"]
+                        indoor_conditions = st.session_state.project_data["indoor_conditions"]
+                        internal_loads = st.session_state.project_data["internal_loads"]
+                        building_info = st.session_state.project_data["building_info"]
+                        sim_period = st.session_state.project_data["sim_period"]
+                        hvac_settings = st.session_state.project_data["hvac_settings"]
+
+                        if not hourly_data:
+                            st.error("No climate data available. Please configure climate data first.")
+                            logger.error("HVAC calculation failed: No climate data available")
+                            return
+                        elif not any(comp_list for comp_list in components.values()):
+                            st.error("No building components defined. Please configure components first.")
+                            logger.error("HVAC calculation failed: No building components defined")
+                            return
+                        else:
+                            loads = TFMCalculations.calculate_tfm_loads(
+                                components=components,
+                                hourly_data=hourly_data,
+                                indoor_conditions=indoor_conditions,
+                                internal_loads=internal_loads,
+                                building_info=building_info,
+                                sim_period=sim_period,
+                                hvac_settings=hvac_settings
+                            )
+
+                            # Clear previous HVAC loads from session state
+                            st.session_state.project_data["hvac_loads"] = {
+                                "cooling": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}},
+                                "heating": {"hourly": [], "peak": 0, "charts": {}, "breakdown": {}}
+                            }
+
+                            # Update session state with new results
+                            cooling_loads = [load for load in loads if load["total_cooling"] > 0]
+                            heating_loads = [load for load in loads if load["total_heating"] > 0]
+                            st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] = cooling_loads
+                            st.session_state.project_data["hvac_loads"]["heating"]["hourly"] = heating_loads
+                            st.session_state.project_data["hvac_loads"]["cooling"]["peak"] = max([load["total_cooling"] for load in cooling_loads], default=0)
+                            st.session_state.project_data["hvac_loads"]["heating"]["peak"] = max([load["total_heating"] for load in heating_loads], default=0)
+                            st.session_state.project_data["hvac_loads"]["cooling"]["charts"] = {}
+                            st.session_state.project_data["hvac_loads"]["heating"]["charts"] = {}
+
+                            # Store breakdown
+                            cooling_breakdown = {
+                                "Conduction": sum(load["conduction_cooling"] for load in cooling_loads),
+                                "Solar Gains": sum(load["solar"] for load in cooling_loads),
+                                "Internal": sum(load["internal"] for load in cooling_loads),
+                                "Ventilation Sensible": sum(system.get("sensible_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("ventilation", [])),
+                                "Ventilation Latent": sum(system.get("latent_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("ventilation", [])),
+                                "Infiltration Sensible": sum(system.get("sensible_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("infiltration", [])),
+                                "Infiltration Latent": sum(system.get("latent_load", 0.0) for system in st.session_state.project_data["internal_loads"].get("infiltration", []))
+                            }
+                            heating_breakdown = {
+                                "conduction": sum(load["conduction_heating"] for load in heating_loads),
+                                "ventilation": sum(load["ventilation_heating"] for load in heating_loads),
+                                "infiltration": sum(load["infiltration_heating"] for load in heating_loads)
+                            }
+                            st.session_state.project_data["hvac_loads"]["cooling"]["charts"]["pie_by_component"] = cooling_breakdown
+                            st.session_state.project_data["hvac_loads"]["heating"]["breakdown"] = heating_breakdown
+
+                            st.success("HVAC loads calculated successfully.")
+                            logger.info("HVAC loads calculated and stored in session state")
+                            st.button("View HVAC Load Results", on_click=lambda: st.session_state.update({"hvac_tab": "HVAC Load Results"}))
+
+                except Exception as e:
+                    st.error(f"Error calculating HVAC loads: {str(e)}")
+                    logger.error(f"HVAC calculation error: {str(e)}")
+
+        # HVAC Load Results tab
+        with tab2:
+            if (
+                st.session_state.project_data.get("hvac_loads", {}).get("cooling", {}).get("hourly")
+                or st.session_state.project_data.get("hvac_loads", {}).get("heating", {}).get("hourly")
+            ):
+                loads = []
+                cooling_loads = st.session_state.project_data["hvac_loads"]["cooling"].get("hourly", [])
+                heating_loads = st.session_state.project_data["hvac_loads"]["heating"].get("hourly", [])
+                loads.extend(cooling_loads)
+                loads.extend(heating_loads)
+                # Sort loads by month, day, hour to ensure consistent display
+                loads = sorted(loads, key=lambda x: (x["month"], x["day"], x["hour"]))
+                if loads:
+                    display_hvac_results_ui(loads, run_id=run_id)
+            else:
+                st.info("Please configure and calculate HVAC loads in the 'HVAC Load Input' tab to view results.")
 
     except Exception as e:
         st.error(f"Error rendering HVAC Loads page: {str(e)}")