Update app/hvac_loads.py

app/hvac_loads.py

@@ -1151,23 +1151,30 @@ 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.
     """
     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
-        import uuid
         run_id = str(uuid.uuid4())
 
         # Check for existing results
         loads = []
-        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")):
-            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)
+        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:
@@ -1560,6 +1567,12 @@ def display_hvac_loads_page():
                         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,
@@ -1570,12 +1583,6 @@ def display_hvac_loads_page():
                             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]
@@ -1597,9 +1604,9 @@ def display_hvac_loads_page():
                             "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)
+                            "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