Upload main.py

main.py

@@ -18,7 +18,7 @@ import logging
 from typing import Dict, List, Any, Optional, Tuple
 from enum import Enum
 import scipy.linalg as linalg
-from data.material_library import MaterialLibrary, MaterialCategory, Construction, Material, GlazingMaterial
+from data.material_library import MaterialLibrary, MaterialCategory, Construction, Material, GlazingMaterial, DoorMaterial
 from data.climate_data import ClimateData, ClimateLocation
 import streamlit.components.v1 as components
 from data.calculation import TFMCalculations, ComponentType
@@ -44,6 +44,13 @@ class GlazingMaterial:
         self.h_o = h_o
         self.is_library = is_library
 
+class DoorMaterial:
+    def __init__(self, name: str, u_value: float, solar_absorption: float, is_library: bool = True):
+        self.name = name
+        self.u_value = u_value
+        self.solar_absorption = solar_absorption
+        self.is_library = is_library
+
 class GlazingMaterial:
     def __init__(self, name: str, shgc: float, u_value: float, h_o: float, is_library: bool = True):
         self.name = name
@@ -52,11 +59,18 @@ class GlazingMaterial:
         self.h_o = h_o
         self.is_library = is_library
 
+class DoorMaterial:
+    def __init__(self, name: str, u_value: float, solar_absorption: float, is_library: bool = True):
+        self.name = name
+        self.u_value = u_value
+        self.solar_absorption = solar_absorption
+        self.is_library = is_library
+
 class Component:
     def __init__(self, name: str, component_type: ComponentType, area: float, elevation: Optional[str] = None,
                  orientation: Optional[float] = None, rotation: float = 0.0, tilt: float = None,
                  construction: Optional[Construction] = None, glazing_material: Optional[GlazingMaterial] = None,
-                 door_material: Optional[Construction] = None, layers: List[Dict] = None, u_value: float = None,
+                 door_material: Optional[DoorMaterial] = None, layers: List[Dict] = None, u_value: float = None,
                  shgc: float = None):
         self.name = name
         self.component_type = component_type
@@ -77,8 +91,8 @@ class Component:
             self.u_value = door_material.u_value
         else:
             self.u_value = construction.u_value if construction else self.calculate_u_value()
-        self.solar_absorptance = (door_material.solar_absorptance if door_material else
-                                  construction.solar_absorptance if construction else 0.6)
+        self.solar_absorptivity = (door_material.solar_absorption if door_material else
+                                  construction.solar_absorption if construction else 0.6)
         self.shgc = shgc if shgc is not None else (glazing_material.shgc if glazing_material else None)
         
         # Compute orientation_angle
@@ -480,7 +494,7 @@ class HVACCalculator:
                                     "specific_heat": material.specific_heat,
                                     "default_thickness": material.default_thickness,
                                     "embodied_carbon": material.embodied_carbon,
-                                    "solar_absorptance": material.solar_absorption,
+                                    "solar_absorption": material.solar_absorption,
                                     "price": material.price,
                                     "emissivity": material.emissivity,
                                     "is_edit": False
@@ -493,7 +507,7 @@ class HVACCalculator:
                                     "specific_heat": material.specific_heat,
                                     "default_thickness": material.default_thickness,
                                     "embodied_carbon": material.embodied_carbon,
-                                    "solar_absorptance": material.solar_absorption,
+                                    "solar_absorption": material.solar_absorption,
                                     "price": material.price,
                                     "emissivity": material.emissivity
                                 }
@@ -552,7 +566,7 @@ class HVACCalculator:
                                         "specific_heat": material.specific_heat,
                                         "default_thickness": material.default_thickness,
                                         "embodied_carbon": material.embodied_carbon,
-                                        "solar_absorptance": material.solar_absorption,
+                                        "solar_absorption": material.solar_absorption,
                                         "price": material.price,
                                         "emissivity": material.emissivity,
                                         "is_edit": True,
@@ -566,7 +580,7 @@ class HVACCalculator:
                                         "specific_heat": material.specific_heat,
                                         "default_thickness": material.default_thickness,
                                         "embodied_carbon": material.embodied_carbon,
-                                        "solar_absorptance": material.solar_absorption,
+                                        "solar_absorption": material.solar_absorption,
                                         "price": material.price,
                                         "emissivity": material.emissivity
                                     }
@@ -596,7 +610,7 @@ class HVACCalculator:
                             "specific_heat": 1000.0,
                             "default_thickness": 0.1,
                             "embodied_carbon": 0.5,
-                            "solar_absorptance": 0.6,
+                            "solar_absorption": 0.6,
                             "price": 50.0,
                             "emissivity": 0.925
                         })
@@ -624,7 +638,7 @@ class HVACCalculator:
                             "Thermal Conductivity (W/m·K)",
                             min_value=0.01,
                             value=form_state.get("conductivity", editor_state.get("conductivity", 0.1)),
-                            help="Heat flow ease (used to calculate U-Value)",
+                            help="Heat flow ease",
                             key="material_conductivity_input"
                         )
                         density = st.number_input(
@@ -655,13 +669,13 @@ class HVACCalculator:
                             help="Production carbon emissions",
                             key="material_embodied_carbon_input"
                         )
-                        solar_absorptance = st.number_input(
-                            "Solar Absorptance",
+                        solar_absorption = st.number_input(
+                            "Solar Absorption",
                             min_value=0.0,
                             max_value=1.0,
-                            value=form_state.get("solar_absorptance", editor_state.get("solar_absorptance", 0.6)),
+                            value=form_state.get("solar_absorption", editor_state.get("solar_absorption", 0.6)),
                             help="Solar radiation absorbed",
-                            key="material_solar_absorptance_input"
+                            key="material_solar_absorption_input"
                         )
                         price = st.number_input(
                             "Price (USD/m²)",
@@ -675,7 +689,7 @@ class HVACCalculator:
                             min_value=0.0,
                             max_value=1.0,
                             value=form_state.get("emissivity", editor_state.get("emissivity", 0.925)),
-                            help="Ratio of radiation emitted by the material",
+                            help="Ratio of radiation emitted by the material (0.0 to 1.0)",
                             key="material_emissivity_input"
                         )
     
@@ -691,7 +705,7 @@ class HVACCalculator:
                                     "specific_heat": specific_heat,
                                     "default_thickness": default_thickness,
                                     "embodied_carbon": embodied_carbon,
-                                    "solar_absorptance": solar_absorptance,
+                                    "solar_absorption": solar_absorption,
                                     "price": price,
                                     "emissivity": emissivity
                                 }
@@ -710,7 +724,7 @@ class HVACCalculator:
                                             specific_heat=specific_heat,
                                             default_thickness=default_thickness,
                                             embodied_carbon=embodied_carbon,
-                                            solar_absorption=solar_absorptance,
+                                            solar_absorption=solar_absorption,
                                             price=price,
                                             emissivity=emissivity,
                                             is_library=False
@@ -732,7 +746,7 @@ class HVACCalculator:
                                                 "specific_heat": 1000.0,
                                                 "default_thickness": 0.1,
                                                 "embodied_carbon": 0.5,
-                                                "solar_absorptance": 0.6,
+                                                "solar_absorption": 0.6,
                                                 "price": 50.0,
                                                 "emissivity": 0.925
                                             }
@@ -750,13 +764,8 @@ class HVACCalculator:
                                                                 project_materials=st.session_state.project_materials,
                                                                 only_project=True)
                 if not material_df.empty:
-                    # Rename columns for consistency
-                    material_df = material_df.rename(columns={
-                        "Conductivity (W/m·K)": "U-Value (W/m²·K)",
-                        "Solar Absorption": "Solar Absorptance"
-                    })
-                    # Recompute U-Value using get_u_value()
-                    material_df["U-Value (W/m²·K)"] = [m.get_u_value() for m in st.session_state.project_materials.values()]
+                    # Ensure emissivity is included in the DataFrame
+                    material_df['Emissivity'] = [m.emissivity for m in st.session_state.project_materials.values()]
                     st.dataframe(material_df, use_container_width=True)
                 else:
                     st.write("No project materials to display.")
@@ -1070,19 +1079,6 @@ class HVACCalculator:
                     project_constructions = construction_df
                     if construction_filter != "All":
                         project_constructions = project_constructions[project_constructions['Component Type'] == construction_filter]
-                    # Remove Solar Absorption, keep Solar Absorptance
-                    if 'Solar Absorption' in project_constructions.columns:
-                        project_constructions = project_constructions.drop(columns=['Solar Absorption'])
-                    project_constructions['Solar Absorptance'] = [
-                        c.layers[0]["material"].solar_absorption if c.layers else 0.6
-                        for c in st.session_state.project_constructions.values()
-                        if c.component_type == construction_filter or construction_filter == "All"
-                    ]
-                    project_constructions['Emissivity'] = [
-                        c.layers[0]["material"].emissivity if c.layers else 0.925
-                        for c in st.session_state.project_constructions.values()
-                        if c.component_type == construction_filter or construction_filter == "All"
-                    ]
                     st.dataframe(project_constructions, use_container_width=True)
                 else:
                     st.write("No project constructions to display.")
@@ -1121,20 +1117,14 @@ class HVACCalculator:
                                     "name": glazing.name,
                                     "shgc": glazing.shgc,
                                     "u_value": glazing.u_value,
-                                    "embodied_carbon": glazing.embodied_carbon,
-                                    "price": glazing.price,
                                     "h_o": glazing.h_o,
-                                    "iac": 1.0,  # Default IAC
                                     "is_edit": False
                                 }
                                 st.session_state.glazing_form_state = {
                                     "name": glazing.name,
                                     "shgc": glazing.shgc,
                                     "u_value": glazing.u_value,
-                                    "embodied_carbon": glazing.embodied_carbon,
-                                    "price": glazing.price,
-                                    "h_o": glazing.h_o,
-                                    "iac": 1.0
+                                    "h_o": glazing.h_o
                                 }
                                 st.session_state.active_tab = "Glazing"
                         if cols[4].button("Copy", key=f"copy_lib_glz_{glazing.name}"):
@@ -1147,17 +1137,12 @@ class HVACCalculator:
                                 name=new_name,
                                 shgc=glazing.shgc,
                                 u_value=glazing.u_value,
-                                embodied_carbon=glazing.embodied_carbon,
-                                price=glazing.price,
                                 h_o=glazing.h_o,
                                 is_library=False
                             )
-                            success, message = self.material_library.add_project_glazing_material(new_glazing, st.session_state.project_glazing_materials)
-                            if success:
-                                st.success(message)
-                                st.session_state.rerun_pending = True
-                            else:
-                                st.error(message)
+                            st.session_state.project_glazing_materials[new_name] = new_glazing
+                            st.success(f"Glazing material '{new_name}' copied!")
+                            st.session_state.rerun_pending = True
     
                 st.subheader("Project Glazing")
                 with st.container():
@@ -1180,10 +1165,7 @@ class HVACCalculator:
                                         "name": glazing.name,
                                         "shgc": glazing.shgc,
                                         "u_value": glazing.u_value,
-                                        "embodied_carbon": glazing.embodied_carbon,
-                                        "price": glazing.price,
                                         "h_o": glazing.h_o,
-                                        "iac": 1.0,  # Default IAC
                                         "is_edit": True,
                                         "original_name": glazing.name
                                     }
@@ -1191,21 +1173,17 @@ class HVACCalculator:
                                         "name": glazing.name,
                                         "shgc": glazing.shgc,
                                         "u_value": glazing.u_value,
-                                        "embodied_carbon": glazing.embodied_carbon,
-                                        "price": glazing.price,
-                                        "h_o": glazing.h_o,
-                                        "iac": 1.0
+                                        "h_o": glazing.h_o
                                     }
                                     st.session_state.active_tab = "Glazing"
                             if cols[4].button("Delete", key=f"delete_proj_glz_{glazing.name}"):
-                                success, message = self.material_library.delete_project_glazing_material(
-                                    glazing.name, st.session_state.project_glazing_materials, st.session_state.components
-                                )
-                                if success:
-                                    st.success(message)
-                                    st.session_state.rerun_pending = True
+                                if any(comp.glazing_material and comp.glazing_material.name == glazing.name
+                                       for comp_list in st.session_state.components.values() for comp in comp_list):
+                                    st.error(f"Glazing material '{glazing.name}' is used in components and cannot be deleted.")
                                 else:
-                                    st.error(message)
+                                    del st.session_state.project_glazing_materials[glazing.name]
+                                    st.success(f"Glazing material '{glazing.name}' deleted!")
+                                    st.session_state.rerun_pending = True
                     else:
                         st.write("No project glazing materials added.")
     
@@ -1217,11 +1195,8 @@ class HVACCalculator:
                         form_state = st.session_state.get("glazing_form_state", {
                             "name": "",
                             "shgc": 0.7,
-                            "u_value": 2.0,
-                            "embodied_carbon": 40.0,
-                            "price": 100.0,
-                            "h_o": 17.8,
-                            "iac": 1.0
+                            "u_value": 5.0,
+                            "h_o": 23.0
                         })
                         is_edit = editor_state.get("is_edit", False)
                         original_name = editor_state.get("original_name", "")
@@ -1236,45 +1211,23 @@ class HVACCalculator:
                             min_value=0.0,
                             max_value=1.0,
                             value=form_state.get("shgc", editor_state.get("shgc", 0.7)),
-                            help="Solar heat gain coefficient",
+                            help="Fraction of solar radiation admitted",
                             key="glazing_shgc_input"
                         )
                         u_value = st.number_input(
                             "U-Value (W/m²·K)",
                             min_value=0.1,
-                            value=form_state.get("u_value", editor_state.get("u_value", 2.0)),
+                            value=form_state.get("u_value", editor_state.get("u_value", 5.0)),
                             help="Thermal transmittance",
                             key="glazing_u_value_input"
                         )
-                        embodied_carbon = st.number_input(
-                            "Embodied Carbon (kgCO₂e/m²)",
-                            min_value=0.0,
-                            value=form_state.get("embodied_carbon", editor_state.get("embodied_carbon", 40.0)),
-                            help="Production carbon emissions",
-                            key="glazing_embodied_carbon_input"
-                        )
-                        price = st.number_input(
-                            "Price (USD/m²)",
-                            min_value=0.0,
-                            value=form_state.get("price", editor_state.get("price", 100.0)),
-                            help="Cost per area",
-                            key="glazing_price_input"
-                        )
                         h_o = st.number_input(
-                            "Exterior Surface Conductance (h_o) (W/m²·K)",
+                            "Exterior Surface Conductance (W/m²·K)",
                             min_value=0.0,
-                            value=form_state.get("h_o", editor_state.get("h_o", 17.8)),
+                            value=form_state.get("h_o", editor_state.get("h_o", 23.0)),
                             help="Exterior surface heat transfer coefficient",
                             key="glazing_h_o_input"
                         )
-                        iac = st.number_input(
-                            "Interior Attenuation Coefficient (IAC)",
-                            min_value=0.0,
-                            max_value=1.0,
-                            value=form_state.get("iac", editor_state.get("iac", 1.0)),
-                            help="Interior solar attenuation",
-                            key="glazing_iac_input"
-                        )
     
                         if st.form_submit_button("Save Glazing"):
                             action_id = str(uuid.uuid4())
@@ -1284,68 +1237,82 @@ class HVACCalculator:
                                     "name": name,
                                     "shgc": shgc,
                                     "u_value": u_value,
-                                    "embodied_carbon": embodied_carbon,
-                                    "price": price,
-                                    "h_o": h_o,
-                                    "iac": iac
+                                    "h_o": h_o
                                 }
                                 if not name or not name.strip():
                                     st.error("Glazing name cannot be empty.")
                                 elif (name in st.session_state.project_glazing_materials or name in getattr(self.material_library, 'library_glazing_materials', {})) and (not is_edit or name != original_name):
-                                    st.error(f"Glazing '{name}' already exists.")
+                                    st.error(f"Glazing material '{name}' already exists.")
                                 else:
                                     try:
+                                        save_as_new = is_edit and name != original_name
                                         new_glazing = GlazingMaterial(
                                             name=name,
                                             shgc=shgc,
                                             u_value=u_value,
-                                            embodied_carbon=embodied_carbon,
-                                            price=price,
                                             h_o=h_o,
                                             is_library=False
                                         )
-                                        # Note: IAC is not stored in GlazingMaterial as per material_library.py
-                                        if is_edit:
-                                            success, message = self.material_library.edit_project_glazing_material(
-                                                original_name, new_glazing, st.session_state.project_glazing_materials, st.session_state.components
-                                            )
-                                        else:
-                                            success, message = self.material_library.add_project_glazing_material(new_glazing, st.session_state.project_glazing_materials)
-                                        if success:
-                                            st.success(message)
-                                            st.session_state.glazing_editor = {}
-                                            st.session_state.glazing_form_state = {
-                                                "name": "",
-                                                "shgc": 0.7,
-                                                "u_value": 2.0,
-                                                "embodied_carbon": 40.0,
-                                                "price": 100.0,
-                                                "h_o": 17.8,
-                                                "iac": 1.0
-                                            }
-                                            st.session_state.glazing_action = {"action": None, "id": None}
-                                            st.session_state.rerun_trigger = None
-                                            st.session_state.rerun_pending = True
+                                        if is_edit and not save_as_new:
+                                            st.session_state.project_glazing_materials[original_name] = new_glazing
+                                            st.success(f"Glazing material '{name}' updated!")
                                         else:
-                                            st.error(f"Failed to save glazing: {message}")
+                                            st.session_state.project_glazing_materials[name] = new_glazing
+                                            st.success(f"Glazing material '{name}' added!")
+                                        st.session_state.glazing_editor = {}
+                                        st.session_state.glazing_form_state = {
+                                            "name": "",
+                                            "shgc": 0.7,
+                                            "u_value": 5.0,
+                                            "h_o": 23.0
+                                        }
+                                        st.session_state.glazing_action = {"action": None, "id": None}
+                                        st.session_state.rerun_trigger = None
+                                        st.session_state.rerun_pending = True
                                     except Exception as e:
-                                        st.error(f"Error saving glazing: {str(e)}")
+                                        st.error(f"Error saving glazing material: {str(e)}")
     
             st.subheader("Project Glazing")
-            try:
-                glazing_df = self.material_library.to_dataframe("glazing_materials",
-                                                               project_glazing_materials=st.session_state.project_glazing_materials,
-                                                               only_project=True)
-                if not glazing_df.empty:
-                    # Add IAC and Source
-                    glazing_df['Interior Attenuation Coefficient (IAC)'] = 1.0  # Default since not in GlazingMaterial
-                    glazing_df['Source'] = ['Project' if not g.is_library else 'Library' for g in st.session_state.project_glazing_materials.values()]
-                    st.dataframe(glazing_df, use_container_width=True)
-                else:
-                    st.write("No project glazing materials to display.")
-            except Exception as e:
-                st.error(f"Error displaying project glazing: {str(e)}")
-                st.write("No glazing materials to display.")
+            if st.session_state.project_glazing_materials:
+                try:
+                    glazing_df = self.material_library.to_dataframe("glazing",
+                                                                   project_glazing_materials=st.session_state.project_glazing_materials,
+                                                                   only_project=True)
+                    if glazing_df.empty:
+                        # Fallback: Construct DataFrame manually
+                        glazing_data = [
+                            {
+                                "Name": g.name,
+                                "SHGC": g.shgc,
+                                "U-Value (W/m²·K)": g.u_value,
+                                "Exterior Conductance (W/m²·K)": g.h_o
+                            }
+                            for g in st.session_state.project_glazing_materials.values()
+                        ]
+                        glazing_df = pd.DataFrame(glazing_data)
+                    if not glazing_df.empty:
+                        st.dataframe(glazing_df, use_container_width=True)
+                    else:
+                        st.write("No project glazing materials to display.")
+                except Exception as e:
+                    # Fallback: Construct DataFrame manually
+                    glazing_data = [
+                        {
+                            "Name": g.name,
+                            "SHGC": g.shgc,
+                            "U-Value (W/m²·K)": g.u_value,
+                            "Exterior Conductance (W/m²·K)": g.h_o
+                        }
+                        for g in st.session_state.project_glazing_materials.values()
+                    ]
+                    glazing_df = pd.DataFrame(glazing_data)
+                    if not glazing_df.empty:
+                        st.dataframe(glazing_df, use_container_width=True)
+                    else:
+                        st.error(f"Error displaying project glazing materials: {str(e)}")
+                        st.write("No project glazing materials to display.")
+            else:
+                st.write("No project glazing materials to display.")
     
         with tab4:
             st.subheader("Doors")
@@ -1362,44 +1329,28 @@ class HVACCalculator:
                         library_door_list = []
                     cols = st.columns([2, 1, 1, 1, 1])
                     cols[0].write("**Name**")
-                    cols[1].write("**Solar Absorption**")  # Changed to match material_library.py
-                    cols[2].write("**U-Value (W/m²·K)**")
+                    cols[1].write("**U-Value (W/m²·K)**")
+                    cols[2].write("**Solar Abs.**")
                     cols[3].write("**Preview**")
                     cols[4].write("**Copy**")
                     for door in library_door_list:
                         cols = st.columns([2, 1, 1, 1, 1])
                         cols[0].write(door.name)
-                        cols[1].write(f"{door.solar_absorption:.2f}")
-                        cols[2].write(f"{door.u_value:.3f}")
+                        cols[1].write(f"{door.u_value:.3f}")
+                        cols[2].write(f"{door.solar_absorption:.2f}")
                         if cols[3].button("Preview", key=f"preview_lib_door_{door.name}"):
                             if st.session_state.get("rerun_trigger") != f"preview_door_{door.name}":
                                 st.session_state.rerun_trigger = f"preview_door_{door.name}"
                                 st.session_state.door_editor = {
                                     "name": door.name,
-                                    "category": door.category.value,
-                                    "conductivity": door.conductivity,
-                                    "density": door.density,
-                                    "specific_heat": door.specific_heat,
-                                    "default_thickness": door.default_thickness,
                                     "u_value": door.u_value,
-                                    "solar_absorption": door.solar_absorption,  # Changed to match material_library.py
-                                    "embodied_carbon": door.embodied_carbon,
-                                    "price": door.price,
-                                    "emissivity": door.emissivity,
+                                    "solar_absorption": door.solar_absorption,
                                     "is_edit": False
                                 }
                                 st.session_state.door_form_state = {
                                     "name": door.name,
-                                    "category": door.category.value,
-                                    "conductivity": door.conductivity,
-                                    "density": door.density,
-                                    "specific_heat": door.specific_heat,
-                                    "default_thickness": door.default_thickness,
                                     "u_value": door.u_value,
-                                    "solar_absorption": door.solar_absorption,  # Changed to match material_library.py
-                                    "embodied_carbon": door.embodied_carbon,
-                                    "price": door.price,
-                                    "emissivity": door.emissivity
+                                    "solar_absorption": door.solar_absorption
                                 }
                                 st.session_state.active_tab = "Doors"
                         if cols[4].button("Copy", key=f"copy_lib_door_{door.name}"):
@@ -1410,211 +1361,168 @@ class HVACCalculator:
                                 counter += 1
                             new_door = DoorMaterial(
                                 name=new_name,
-                                category=door.category,
-                                conductivity=door.conductivity,
-                                density=door.density,
-                                specific_heat=door.specific_heat,
-                                default_thickness=door.default_thickness,
                                 u_value=door.u_value,
                                 solar_absorption=door.solar_absorption,
-                                embodied_carbon=door.embodied_carbon,
-                                price=door.price,
-                                emissivity=door.emissivity,
                                 is_library=False
                             )
-                            success, message = self.material_library.add_project_door_material(new_door, st.session_state.project_door_materials)
-                            if success:
-                                st.success(message)
-                                st.session_state.rerun_pending = True
-                            else:
-                                st.error(message)
-    
-                with col2:
-                    st.subheader("Door Editor/Creator")
-                    with st.container():
-                        with st.form("door_editor_form", clear_on_submit=False):
-                            editor_state = st.session_state.get("door_editor", {})
-                            form_state = st.session_state.get("door_form_state", {
-                                "name": "",
-                                "category": "Sub-Structural Materials",
-                                "conductivity": 0.20,
-                                "density": 20.0,
-                                "specific_heat": 2000.0,
-                                "default_thickness": 0.05,
-                                "u_value": 2.0,
-                                "solar_absorption": 0.6,  # Changed to match material_library.py
-                                "embodied_carbon": 20.0,
-                                "price": 200.0,
-                                "emissivity": 0.925
-                            })
-                            is_edit = editor_state.get("is_edit", False)
-                            original_name = editor_state.get("original_name", "")
-                            name = st.text_input(
-                                "Door Material Name",
-                                value=form_state.get("name", editor_state.get("name", "")),
-                                help="Unique door material identifier",
-                                key="door_name_input"
-                            )
-                            default_category = form_state.get("category", editor_state.get("category", "Sub-Structural Materials"))
-                            category_index = ([c.value for c in MaterialCategory].index(default_category)
-                                             if default_category in [c.value for c in MaterialCategory] else 0)
-                            category = st.selectbox(
-                                "Category",
-                                [c.value for c in MaterialCategory],
-                                index=category_index,
-                                help="Material type classification",
-                                key="door_category_input"
-                            )
-                            conductivity = st.number_input(
-                                "Thermal Conductivity (W/m·K)",
-                                min_value=0.01,
-                                value=form_state.get("conductivity", editor_state.get("conductivity", 0.25)),
-                                help="Heat flow ease",
-                                key="door_conductivity_input"
-                            )
-                            density = st.number_input(
-                                "Density (kg/m³)",
-                                min_value=1.0,
-                                value=form_state.get("density", editor_state.get("density", 20.0)),
-                                help="Mass per volume",
-                                key="door_density_input"
-                            )
-                            specific_heat = st.number_input(
-                                "Specific Heat (J/kg·K)",
-                                min_value=100.0,  # Aligned with DoorMaterial
-                                value=form_state.get("specific_heat", editor_state.get("specific_heat", 2000.0)),
-                                help="Heat storage capacity",
-                                key="door_specific_heat_input"
-                            )
-                            default_thickness = st.number_input(
-                                "Default Thickness (m)",
-                                min_value=0.01,  # Aligned with DoorMaterial
-                                value=form_state.get("default_thickness", editor_state.get("default_thickness", 0.05)),
-                                help="Typical thickness",
-                                key="door_thickness_input"
-                            )
-                            u_value = st.number_input(
-                                "U-Value (W/m²·K)",
-                                min_value=0.1,
-                                value=form_state.get("u_value", editor_state.get("u_value", 2.0)),
-                                help="Thermal conductance of the door",
-                                key="door_u_value_input"
-                            )
-                            solar_absorption = st.number_input(
-                                "Solar Absorption",  # Changed to match material_library.py
-                                min_value=0.0,
-                                max_value=1.0,
-                                value=form_state.get("solar_absorption", editor_state.get("solar_absorption", 0.6)),
-                                help="Solar radiation absorbed by the door",
-                                key="door_absorption_input"
-                            )
-                            embodied_carbon = st.number_input(
-                                "Embodied Carbon (kgCO₂e/m²)",
-                                min_value=0.0,
-                                value=form_state.get("embodied_carbon", editor_state.get("embodied_carbon", 20.0)),
-                                help="Production carbon emissions",
-                                key="door_embodied_carbon_input"
-                            )
-                            price = st.number_input(
-                                "Price (USD/m²)",
-                                min_value=0.0,
-                                value=form_state.get("price", editor_state.get("price", 200.0)),
-                                help="Cost per area",
-                                key="door_price_input"
-                            )
-                            emissivity = st.number_input(
-                                "Emissivity",
-                                min_value=0.0,
-                                max_value=1.0,
-                                value=form_state.get("emissivity", editor_state.get("emissivity", 0.925)),
-                                help="Ratio of radiation emitted by the door",
-                                key="door_emissivity_input"
-                            )
+                            st.session_state.project_door_materials[new_name] = new_door
+                            st.success(f"Door material '{new_name}' copied!")
+                            st.session_state.rerun_pending = True
     
-                            if st.form_submit_button("Save Door Material"):
-                                action_id = str(uuid.uuid4())
-                                if st.session_state.door_action.get("id") != action_id:
-                                    st.session_state.door_action = {"action": "save", "id": action_id}
+                st.subheader("Project Doors")
+                with st.container():
+                    if st.session_state.project_door_materials:
+                        cols = st.columns([2, 1, 1, 1, 1])
+                        cols[0].write("**Name**")
+                        cols[1].write("**U-Value (W/m²·K)**")
+                        cols[2].write("**Solar Abs.**")
+                        cols[3].write("**Edit**")
+                        cols[4].write("**Delete**")
+                        for door in st.session_state.project_door_materials.values():
+                            cols = st.columns([2, 1, 1, 1, 1])
+                            cols[0].write(door.name)
+                            cols[1].write(f"{door.u_value:.3f}")
+                            cols[2].write(f"{door.solar_absorption:.2f}")
+                            if cols[3].button("Edit", key=f"edit_proj_door_{door.name}"):
+                                if st.session_state.get("rerun_trigger") != f"edit_door_{door.name}":
+                                    st.session_state.rerun_trigger = f"edit_door_{door.name}"
+                                    st.session_state.door_editor = {
+                                        "name": door.name,
+                                        "u_value": door.u_value,
+                                        "solar_absorption": door.solar_absorption,
+                                        "is_edit": True,
+                                        "original_name": door.name
+                                    }
                                     st.session_state.door_form_state = {
-                                        "name": name,
-                                        "category": category,
-                                        "conductivity": conductivity,
-                                        "density": density,
-                                        "specific_heat": specific_heat,
-                                        "default_thickness": default_thickness,
-                                        "u_value": u_value,
-                                        "solar_absorption": solar_absorption,  # Changed to match material_library.py
-                                        "embodied_carbon": embodied_carbon,
-                                        "price": price,
-                                        "emissivity": emissivity
+                                        "name": door.name,
+                                        "u_value": door.u_value,
+                                        "solar_absorption": door.solar_absorption
                                     }
-                                    if not name or not name.strip():
-                                        st.error("Door material name cannot be empty.")
-                                    elif (name in st.session_state.project_door_materials or name in getattr(self.material_library, 'library_door_materials', {})) and (
-                                            not is_edit or name != original_name):
-                                        st.error(f"Door material '{name}' already exists.")
-                                    else:
-                                        try:
-                                            new_door = DoorMaterial(
-                                                name=name,
-                                                category=MaterialCategory(category),  # Convert string to MaterialCategory enum
-                                                conductivity=conductivity,
-                                                density=density,
-                                                specific_heat=specific_heat,
-                                                default_thickness=default_thickness,
-                                                u_value=u_value,
-                                                solar_absorption=solar_absorption,
-                                                embodied_carbon=embodied_carbon,
-                                                price=price,
-                                                emissivity=emissivity,
-                                                is_library=False
-                                            )
-                                            if is_edit:
-                                                success, message = self.material_library.edit_project_door_material(
-                                                    original_name, new_door, st.session_state.project_door_materials, st.session_state.components
-                                                )
-                                            else:
-                                                success, message = self.material_library.add_project_door_material(new_door, st.session_state.project_door_materials)
-                                            if success:
-                                                st.success(message)
-                                                st.session_state.door_editor = {}
-                                                st.session_state.door_form_state = {
-                                                    "name": "",
-                                                    "category": "Sub-Structural Materials",
-                                                    "conductivity": 0.20,
-                                                    "density": 20.0,
-                                                    "specific_heat": 2000.0,
-                                                    "default_thickness": 0.05,
-                                                    "u_value": 2.0,
-                                                    "solar_absorption": 0.6,  # Changed to match material_library.py
-                                                    "embodied_carbon": 20.0,
-                                                    "price": 200.0,
-                                                    "emissivity": 0.925
-                                                }
-                                                st.session_state.door_action = {"action": None, "id": None}
-                                                st.session_state.rerun_trigger = None
-                                                st.session_state.rerun_pending = True
-                                            else:
-                                                st.error(f"Failed to save door material: {message}")
-                                        except Exception as e:
-                                            st.error(f"Error saving door material: {str(e)}")
+                                    st.session_state.active_tab = "Doors"
+                            if cols[4].button("Delete", key=f"delete_proj_door_{door.name}"):
+                                if any(comp.door_material and comp.door_material.name == door.name
+                                       for comp_list in st.session_state.components.values() for comp in comp_list):
+                                    st.error(f"Door material '{door.name}' is used in components and cannot be deleted.")
+                                else:
+                                    del st.session_state.project_door_materials[door.name]
+                                    st.success(f"Door material '{door.name}' deleted!")
+                                    st.session_state.rerun_pending = True
+                    else:
+                        st.write("No project door materials added.")
     
-        st.subheader("Detailed Door Materials")
-        try:
-            door_df = self.material_library.to_dataframe("door_materials",
-                                        project_door_materials=st.session_state.project_door_materials,
-                                        only_project=True)
-            if not door_df.empty:
-                # Rename for consistency
-                door_df = door_df.rename(columns={
-                    "Solar Absorption": "Solar Absorptance"
-                })
-                st.dataframe(door_df, use_container_width=True)
+            with col2:
+                st.subheader("Door Editor/Creator")
+                with st.container():
+                    with st.form("door_editor_form", clear_on_submit=False):
+                        editor_state = st.session_state.get("door_editor", {})
+                        form_state = st.session_state.get("door_form_state", {
+                            "name": "",
+                            "u_value": 2.0,
+                            "solar_absorption": 0.6
+                        })
+                        is_edit = editor_state.get("is_edit", False)
+                        original_name = editor_state.get("original_name", "")
+                        name = st.text_input(
+                            "Door Name",
+                            value=form_state.get("name", editor_state.get("name", "")),
+                            help="Unique door identifier",
+                            key="door_name_input"
+                        )
+                        u_value = st.number_input(
+                            "U-Value (W/m²·K)",
+                            min_value=0.1,
+                            value=form_state.get("u_value", editor_state.get("u_value", 2.0)),
+                            help="Thermal transmittance",
+                            key="door_u_value_input"
+                        )
+                        solar_absorption = st.number_input(
+                            "Solar Absorption",
+                            min_value=0.0,
+                            max_value=1.0,
+                            value=form_state.get("solar_absorption", editor_state.get("solar_absorption", 0.6)),
+                            help="Fraction of solar radiation absorbed",
+                            key="door_solar_absorption_input"
+                        )
+    
+                        if st.form_submit_button("Save Door"):
+                            action_id = str(uuid.uuid4())
+                            if st.session_state.door_action.get("id") != action_id:
+                                st.session_state.door_action = {"action": "save", "id": action_id}
+                                st.session_state.door_form_state = {
+                                    "name": name,
+                                    "u_value": u_value,
+                                    "solar_absorption": solar_absorption
+                                }
+                                if not name or not name.strip():
+                                    st.error("Door name cannot be empty.")
+                                elif (name in st.session_state.project_door_materials or name in getattr(self.material_library, 'library_door_materials', {})) and (not is_edit or name != original_name):
+                                    st.error(f"Door material '{name}' already exists.")
+                                else:
+                                    try:
+                                        save_as_new = is_edit and name != original_name
+                                        new_door = DoorMaterial(
+                                            name=name,
+                                            u_value=u_value,
+                                            solar_absorption=solar_absorption,
+                                            is_library=False
+                                        )
+                                        if is_edit and not save_as_new:
+                                            st.session_state.project_door_materials[original_name] = new_door
+                                            st.success(f"Door material '{name}' updated!")
+                                        else:
+                                            st.session_state.project_door_materials[name] = new_door
+                                            st.success(f"Door material '{name}' added!")
+                                        st.session_state.door_editor = {}
+                                        st.session_state.door_form_state = {
+                                            "name": "",
+                                            "u_value": 2.0,
+                                            "solar_absorption": 0.6
+                                        }
+                                        st.session_state.door_action = {"action": None, "id": None}
+                                        st.session_state.rerun_trigger = None
+                                        st.session_state.rerun_pending = True
+                                    except Exception as e:
+                                        st.error(f"Error saving door material: {str(e)}")
+    
+            st.subheader("Project Doors")
+            if st.session_state.project_door_materials:
+                try:
+                    door_df = self.material_library.to_dataframe("doors",
+                                                                project_door_materials=st.session_state.project_door_materials,
+                                                                only_project=True)
+                    if door_df.empty:
+                        # Fallback: Construct DataFrame manually
+                        door_data = [
+                            {
+                                "Name": d.name,
+                                "U-Value (W/m²·K)": d.u_value,
+                                "Solar Absorption": d.solar_absorption
+                            }
+                            for d in st.session_state.project_door_materials.values()
+                        ]
+                        door_df = pd.DataFrame(door_data)
+                    if not door_df.empty:
+                        st.dataframe(door_df, use_container_width=True)
+                    else:
+                        st.write("No project door materials to display.")
+                except Exception as e:
+                    # Fallback: Construct DataFrame manually
+                    door_data = [
+                        {
+                            "Name": d.name,
+                            "U-Value (W/m²·K)": d.u_value,
+                            "Solar Absorption": d.solar_absorption
+                        }
+                        for d in st.session_state.project_door_materials.values()
+                    ]
+                    door_df = pd.DataFrame(door_data)
+                    if not door_df.empty:
+                        st.dataframe(door_df, use_container_width=True)
+                    else:
+                        st.error(f"Error displaying project door materials: {str(e)}")
+                        st.write("No project door materials to display.")
             else:
                 st.write("No project door materials to display.")
-        except Exception as e:
-            st.error(f"Error displaying project doors: {str(e)}")
-            st.write("No door materials to display.")
     
         col1, col2 = st.columns(2)
         with col1: