Update main.py

main.py

@@ -14,6 +14,7 @@ import logging
 import os
 import sys
 from typing import Dict, List, Any, Optional, Tuple
+from datetime import datetime
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -26,7 +27,7 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 from app.intro import display_intro_page
 from app.building_information import display_building_info_page
 from app.climate_data import display_climate_page
-from app.materials_library import display_materials_page, Material, GlazingMaterial, MaterialCategory, MaterialLibrary  # Added MaterialLibrary import
+from app.materials_library import display_materials_page, Material, GlazingMaterial, MaterialCategory, MaterialLibrary
 from app.construction import display_construction_page, get_available_constructions
 from app.components import display_components_page
 from app.internal_loads import display_internal_loads_page
@@ -71,7 +72,7 @@ class BuildSustain:
         if 'current_page' not in st.session_state:
             st.session_state.current_page = "Intro"
         
-        # Initialize material library if not set (Added to support hvac_loads.py)
+        # Initialize material library if not set
         if 'material_library' not in st.session_state:
             st.session_state.material_library = MaterialLibrary()
             logger.info("Initialized MaterialLibrary in session state")
@@ -98,11 +99,7 @@ class BuildSustain:
                         "state_province": "",
                         "country": "",
                         "source": "",
-                        "wmo": "",
-                        "latitude": 0.0,
-                        "longitude": 0.0,
-                        "timezone": 0.0,
-                        "elevation": 0.0
+                        "wmo": ""
                     },
                     "design_conditions": {
                         "winter_design_temp": 0.0,
@@ -121,7 +118,7 @@ class BuildSustain:
                     "epw_filename": "",
                     "typical_extreme_periods": {},
                     "ground_temperatures": {},
-                    "ground_reflectivity": 0.2  # Added for hvac_loads.py solar calculations
+                    "ground_reflectivity": 0.2
                 },
                 "materials": {
                     "library": dict(SAMPLE_MATERIALS),
@@ -156,30 +153,41 @@ class BuildSustain:
                         "peak": 0,
                         "summary_tables": {},
                         "charts": {},
-                        "breakdown": {}  # Added to store detailed load components (e.g., conduction, solar)
+                        "breakdown": {
+                            "conduction": 0.0,
+                            "solar": 0.0,
+                            "internal": 0.0,
+                            "ventilation": 0.0,
+                            "infiltration": 0.0
+                        }
                     },
                     "heating": {
                         "hourly": [],
                         "peak": 0,
                         "summary_tables": {},
                         "charts": {},
-                        "breakdown": {}  # Added to store detailed load components
+                        "breakdown": {
+                            "conduction": 0.0,
+                            "ventilation": 0.0,
+                            "infiltration": 0.0
+                        }
                     }
                 },
-                "hvac_settings": {  # Added to support hvac_loads.py
+                "hvac_settings": {
                     "operating_hours": [{"start": 8, "end": 18}],
                     "system_type": "Default"
                 },
-                "sim_period": {  # Added to support hvac_loads.py
+                "sim_period": {
                     "type": "Full Year",
-                    "start_date": None,
-                    "end_date": None,
+                    "start_date": datetime(2025, 1, 1),
+                    "end_date": datetime(2025, 12, 31),
                     "base_temp": 18.3
                 },
-                "indoor_conditions": {  # Added to support hvac_loads.py
+                "indoor_conditions": {
                     "type": "Fixed Setpoints",
                     "cooling_setpoint": {"temperature": 24.0, "rh": 50.0},
                     "heating_setpoint": {"temperature": 20.0, "rh": 50.0},
+                    "adaptive_acceptability": "90",
                     "schedule": []
                 },
                 "building_energy": {
@@ -365,9 +373,27 @@ class BuildSustain:
                 if key in st.session_state:
                     st.session_state.pop(key, None)
         
-        # Clear HVAC-specific states when leaving the HVAC Loads page (Added to support hvac_loads.py)
+        # Clear HVAC-specific states when leaving the HVAC Loads page
         if previous_page == "HVAC Loads":
             keys_to_clear = [
+                "hvac_country",
+                "hvac_city",
+                "hvac_state_province",
+                "hvac_latitude",
+                "hvac_longitude",
+                "hvac_elevation",
+                "hvac_timezone",
+                "hvac_ground_reflectivity",
+                "hvac_sim_type",
+                "hvac_start_date",
+                "hvac_end_date",
+                "hvac_base_temp",
+                "hvac_indoor_type",
+                "hvac_cooling_temp",
+                "hvac_cooling_rh",
+                "hvac_heating_temp",
+                "hvac_heating_rh",
+                "adaptive_acceptability",
                 "hvac_loads_rerun_pending",
                 "hvac_loads_form_state",
                 "hvac_loads_editor",