Update app/intro.py

app/intro.py

@@ -76,9 +76,6 @@ def display_about_section():
     
     Beta Version 0.4.1 (2025)
     """)
-    
-    # Add Deakin University logo or other relevant images if available
-    # st.image("path_to_logo.png", width=200)
 
 def display_instructions_section():
     """Display instructions on how to use the application."""
@@ -115,9 +112,6 @@ def display_instructions_section():
     * **Sol-Air Temperature**: For solar radiation effects on opaque surfaces
     * **Dynamic Solar Heat Gain**: For fenestration with angle-dependent properties
     """)
-    
-    # Add any diagrams or flowcharts if available
-    # st.image("path_to_flowchart.png", width=600)
 
 def display_project_management_section():
     """Display project management options (new, import, export)."""
@@ -159,21 +153,61 @@ def start_new_project():
         backup_timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
         st.session_state.project_data_backup[backup_timestamp] = st.session_state.project_data.copy()
     
-    # Reset project data to default values
+    # Reset project data to match main.py structure
     st.session_state.project_data = {
         "project_name": "",
         "building_info": {
             "project_name": "",
             "floor_area": 100.0,
             "building_height": 3.0,
-            "indoor_design_temp": 24.0,
-            "indoor_design_rh": 50.0,
-            "ventilation_rate": 0.1,
-            "orientation_angle": 0.0,
-            "operation_hours": 8,
-            "building_type": "Office"
+            "building_type": "Office",
+            "summer_indoor_design_temp": 24.0,
+            "summer_indoor_design_rh": 50.0,
+            "winter_indoor_design_temp": 20.0,
+            "winter_indoor_design_rh": 50.0,
+            "orientation_angle": 0.0
+        },
+        "climate_data": {
+            "id": "",
+            "location": {
+                "city": "",
+                "state_province": "",
+                "country": "",
+                "source": "",
+                "wmo": "",
+                "latitude": 0.0,
+                "longitude": 0.0,
+                "timezone": 0.0,
+                "elevation": 0.0
+            },
+            "design_conditions": {
+                "winter_design_temp": 0.0,
+                "summer_design_temp_db": 30.0,
+                "summer_design_temp_wb": 25.0,
+                "heating_degree_days": 0,
+                "cooling_degree_days": 0,
+                "monthly_average_temps": [20.0] * 12,
+                "monthly_average_radiation": [150.0] * 12,
+                "summer_daily_range": 8.0,
+                "wind_speed": 3.0,
+                "pressure": 101325.0
+            },
+            "climate_zone": "",
+            "hourly_data": [],
+            "epw_filename": "",
+            "typical_extreme_periods": {
+                "summer_extreme": {"start": {"month": 7, "day": 1}, "end": {"month": 7, "day": 7}},
+                "summer_typical": {"start": {"month": 6, "day": 1}, "end": {"month": 6, "day": 7}},
+                "winter_extreme": {"start": {"month": 1, "day": 1}, "end": {"month": 1, "day": 7}},
+                "winter_typical": {"start": {"month": 12, "day": 1}, "end": {"month": 12, "day": 7}}
+            },
+            "ground_temperatures": {
+                "0.5": [20.0] * 12,
+                "2": [18.0] * 12,
+                "4": [16.0] * 12
+            },
+            "ground_reflectivity": 0.2
         },
-        "climate_data": {},
         "materials": {
             "library": {},
             "project": {}
@@ -191,27 +225,74 @@ def start_new_project():
             "roofs": [],
             "floors": [],
             "windows": [],
-            "doors": [],
             "skylights": []
         },
         "internal_loads": {
+            "schedules": {},
             "people": [],
-            "lighting": {},
-            "equipment": {}
+            "lighting": [],
+            "equipment": [],
+            "ventilation": [],
+            "infiltration": []
+        },
+        "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
         },
         "hvac_loads": {
             "cooling": {
                 "hourly": [],
-                "peak": 0,
+                "peak": 0.0,
                 "summary_tables": {},
-                "charts": {}
+                "charts": {
+                    "pie_by_component": {},
+                    "pie_by_orientation": {}
+                },
+                "breakdown": {
+                    "conduction": 0.0,
+                    "solar": 0.0,
+                    "internal": 0.0,
+                    "ventilation_sensible": 0.0,
+                    "ventilation_latent": 0.0,
+                    "infiltration_sensible": 0.0,
+                    "infiltration_latent": 0.0
+                }
             },
             "heating": {
                 "hourly": [],
-                "peak": 0,
+                "peak": 0.0,
                 "summary_tables": {},
-                "charts": {}
-            }
+                "charts": {
+                    "pie_by_component": {},
+                    "pie_by_orientation": {}
+                },
+                "breakdown": {
+                    "conduction": 0.0,
+                    "ventilation": 0.0,
+                    "infiltration": 0.0
+                }
+            },
+            "monthly_summary": {}
+        },
+        "hvac_settings": {
+            "operating_hours": [{"start": 8, "end": 18}],
+            "system_type": "Default"
+        },
+        "sim_period": {
+            "type": "Full Year",
+            "start_date": datetime(2025, 1, 1),
+            "end_date": datetime(2025, 12, 31),
+            "base_temp": 18.3
+        },
+        "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": {
             "hvac_type": "",
@@ -235,12 +316,14 @@ def start_new_project():
         "embodied_energy": {
             "total_embodied_carbon_kgco2e": 0,
             "breakdown_by_component": {},
-            "charts": {}
+            "charts": {},
+            "material_inventory": []
         },
         "materials_cost": {
             "total_cost_usd": 0,
             "breakdown_by_component": {},
-            "charts": {}
+            "charts": {},
+            "material_inventory": []
         }
     }
     
@@ -275,6 +358,12 @@ def load_project(uploaded_file) -> bool:
             backup_timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
             st.session_state.project_data_backup[backup_timestamp] = st.session_state.project_data.copy()
         
+        # Convert datetime strings back to datetime objects if necessary
+        if project_data.get("sim_period", {}).get("start_date"):
+            project_data["sim_period"]["start_date"] = datetime.fromisoformat(project_data["sim_period"]["start_date"])
+        if project_data.get("sim_period", {}).get("end_date"):
+            project_data["sim_period"]["end_date"] = datetime.fromisoformat(project_data["sim_period"]["end_date"])
+        
         # Update session state with the loaded project data
         st.session_state.project_data = project_data
         
@@ -297,6 +386,7 @@ def validate_project_data(project_data: Dict[str, Any]) -> bool:
     """
     # Check for required top-level keys
     required_keys = [
+        "project_name",
         "building_info",
         "climate_data",
         "materials",
@@ -304,7 +394,11 @@ def validate_project_data(project_data: Dict[str, Any]) -> bool:
         "constructions",
         "components",
         "internal_loads",
+        "internal_loads_conditions",
         "hvac_loads",
+        "hvac_settings",
+        "sim_period",
+        "indoor_conditions",
         "building_energy",
         "renewable_energy",
         "embodied_energy",
@@ -321,11 +415,12 @@ def validate_project_data(project_data: Dict[str, Any]) -> bool:
         "project_name",
         "floor_area",
         "building_height",
-        "indoor_design_temp",
-        "indoor_design_rh",
-        "orientation_angle",
-        "operation_hours",
-        "building_type"
+        "building_type",
+        "summer_indoor_design_temp",
+        "summer_indoor_design_rh",
+        "winter_indoor_design_temp",
+        "winter_indoor_design_rh",
+        "orientation_angle"
     ]
     
     for key in building_info_keys:
@@ -333,8 +428,26 @@ def validate_project_data(project_data: Dict[str, Any]) -> bool:
             logger.error(f"Missing required key in building_info: {key}")
             return False
     
+    # Check climate_data structure
+    climate_data_keys = [
+        "id",
+        "location",
+        "design_conditions",
+        "climate_zone",
+        "hourly_data",
+        "epw_filename",
+        "typical_extreme_periods",
+        "ground_temperatures",
+        "ground_reflectivity"
+    ]
+    
+    for key in climate_data_keys:
+        if key not in project_data["climate_data"]:
+            logger.error(f"Missing required key in climate_data: {key}")
+            return False
+    
     # Check components structure
-    component_types = ["walls", "roofs", "floors", "windows", "doors", "skylights"]
+    component_types = ["walls", "roofs", "floors", "windows", "skylights"]
     for component_type in component_types:
         if component_type not in project_data["components"]:
             logger.error(f"Missing component type in components: {component_type}")
@@ -351,11 +464,20 @@ def validate_project_data(project_data: Dict[str, Any]) -> bool:
 def export_project():
     """Export the current project as a downloadable JSON file."""
     try:
+        # Create a deep copy of project data to avoid modifying session state
+        project_data = st.session_state.project_data.copy()
+        
+        # Convert datetime objects to ISO format strings for JSON serialization
+        if project_data.get("sim_period", {}).get("start_date"):
+            project_data["sim_period"]["start_date"] = project_data["sim_period"]["start_date"].isoformat()
+        if project_data.get("sim_period", {}).get("end_date"):
+            project_data["sim_period"]["end_date"] = project_data["sim_period"]["end_date"].isoformat()
+        
         # Convert project data to JSON
-        project_json = json.dumps(st.session_state.project_data, indent=2)
+        project_json = json.dumps(project_data, indent=2)
         
         # Generate filename based on project name
-        project_name = st.session_state.project_data.get("project_name", "unnamed_project")
+        project_name = project_data.get("project_name", "unnamed_project")
         safe_project_name = "".join(c if c.isalnum() else "_" for c in project_name)
         timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
         filename = f"{safe_project_name}_{timestamp}.json"
@@ -390,4 +512,4 @@ def get_download_link(data, filename, link_text):
     """
     b64 = base64.b64encode(data.encode()).decode()
     href = f'<a href="data:application/json;base64,{b64}" download="{filename}">{link_text}</a>'
-    return href
+    return href