Update app/materials_library.py

app/materials_library.py

@@ -2,9 +2,8 @@
 BuildSustain - Material Library Module
 
 This module handles the material library functionality of the BuildSustain application,
-allowing users to manage building materials and doors (previously part of fenestrations) 
-and fenestrations (windows, skylights). It provides both predefined library materials 
-and the ability to create project-specific materials.
+allowing users to manage building materials and fenestrations (windows, skylights).
+It provides both predefined library materials and the ability to create project-specific materials.
 
 Developed by: Dr Majed Abuseif, Deakin University
 © 2025
@@ -20,7 +19,7 @@ from typing import Dict, List, Any, Optional, Tuple, Union
 from enum import Enum
 
 # Import default data and constants from centralized module
-from app.m_c_data import SAMPLE_MATERIALS, SAMPLE_FENESTRATIONS, DEFAULT_MATERIAL_PROPERTIES, DEFAULT_WINDOW_PROPERTIES, DEFAULT_DOOR_PROPERTIES
+from app.m_c_data import SAMPLE_MATERIALS, SAMPLE_FENESTRATIONS, DEFAULT_MATERIAL_PROPERTIES, DEFAULT_WINDOW_PROPERTIES
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -31,12 +30,7 @@ MATERIAL_CATEGORIES = [
     "Insulation",
     "Structural",
     "Finishing",
-    "Sub-Structural",
-    "Door"
-]
-
-FENESTRATION_TYPES = [
-    "Window/Skylight"
+    "Sub-Structural"
 ]
 
 # Surface resistances (EN ISO 6946 or ASHRAE standards)
@@ -48,13 +42,11 @@ class MaterialCategory(Enum):
     STRUCTURAL = "Structural"
     FINISHING = "Finishing"
     SUB_STRUCTURAL = "Sub-Structural"
-    DOOR = "Door"
 
 class Material:
     def __init__(self, name: str, category: MaterialCategory, conductivity: float, density: float,
                  specific_heat: float, default_thickness: float, embodied_carbon: float,
-                 absorptivity: float, price: float, emissivity: float, is_library: bool = True,
-                 u_value: Optional[float] = None):
+                 absorptivity: float, price: float, emissivity: float, is_library: bool = True):
         self.name = name
         self.category = category
         self.conductivity = conductivity
@@ -66,12 +58,9 @@ class Material:
         self.price = price
         self.emissivity = emissivity
         self.is_library = is_library
-        self.u_value = u_value  # For doors, u_value may be provided directly
 
     def get_thermal_mass(self) -> str:
         # Calculate areal heat capacity: ρ * cp * d (J/m²·K)
-        if self.category == MaterialCategory.DOOR:
-            return "N/A"  # Doors typically don't use thermal mass
         thermal_mass = self.density * self.specific_heat * self.default_thickness
         # Categorize based on thresholds
         if thermal_mass < 30000:
@@ -82,9 +71,6 @@ class Material:
             return "High"
 
     def get_u_value(self) -> float:
-        # For doors, return provided u_value if available
-        if self.category == MaterialCategory.DOOR and self.u_value is not None:
-            return self.u_value
         # Calculate U-value: U = 1 / (R_si + (d / λ) + R_se) (W/m²·K)
         if self.default_thickness > 0 and self.conductivity > 0:
             r_value = R_SI + (self.default_thickness / self.conductivity) + R_SE
@@ -92,12 +78,11 @@ class Material:
         return 0.0
 
 class GlazingMaterial:
-    def __init__(self, name: str, shgc: float, u_value: float, h_o: float, category: str, is_library: bool = True):
+    def __init__(self, name: str, shgc: float, u_value: float, h_o: float, is_library: bool = True):
         self.name = name
         self.shgc = shgc
         self.u_value = u_value
         self.h_o = h_o
-        self.category = category
         self.is_library = is_library
 
 class MaterialLibrary:
@@ -130,7 +115,6 @@ class MaterialLibrary:
             data = [
                 {
                     "Name": g.name,
-                    "Category": g.category,
                     "SHGC": g.shgc,
                     "U-Value (W/m²·K)": g.u_value,
                     "Exterior Conductance (W/m²·K)": g.h_o
@@ -166,9 +150,6 @@ class MaterialLibrary:
         try:
             if name not in project_materials:
                 return False, f"Material '{name}' not found."
-            if any(comp.get("material") and comp["material"].name == name
-                   for comp_list in components.values() for comp in comp_list):
-                return False, f"Material '{name}' is used in components and cannot be deleted."
             del project_materials[name]
             return True, f"Material '{name}' deleted successfully!"
         except Exception as e:
@@ -180,7 +161,7 @@ def display_materials_page():
     This is the main function called by main.py when the Material Library page is selected.
     """
     st.title("Material Library")
-    st.write("Manage building materials (including doors) and fenestrations for thermal analysis.")
+    st.write("Manage building materials and fenestrations for thermal analysis.")
 
     # CSS for box heights, scrolling, and visual appeal
     st.markdown("""
@@ -255,16 +236,15 @@ def display_materials_page():
             material_library.library_materials[k] = Material(
                 name=k,
                 category=MaterialCategory[category_str],
-                conductivity=m["thermal_properties"].get("conductivity", 0.0),
-                density=m["thermal_properties"].get("density", 1000.0),
-                specific_heat=m["thermal_properties"].get("specific_heat", 1000.0),
-                default_thickness=m["thickness_range"].get("default", 0.05) if "thickness_range" in m else m.get("default_thickness", 0.05),
-                embodied_carbon=m.get("embodied_carbon", 0.5),
+                conductivity=m["thermal_properties"]["conductivity"],
+                density=m["thermal_properties"]["density"],
+                specific_heat=m["thermal_properties"]["specific_heat"],
+                default_thickness=m["thickness_range"]["default"],
+                embodied_carbon=m["embodied_carbon"],
                 absorptivity=m.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
-                price=m["cost"].get("material", 50.0),
+                price=m["cost"]["material"],
                 emissivity=m.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"]),
-                is_library=True,
-                u_value=m.get("performance", {}).get("u_value") if m.get("category") == "Door" else None
+                is_library=True
             )
             logger.debug(f"Loaded material: {k}, Category: {m['category']}")
         except (KeyError, ValueError) as e:
@@ -274,16 +254,14 @@ def display_materials_page():
     material_library.library_glazing_materials = {}
     for k, f in st.session_state.project_data["fenestrations"]["library"].items():
         try:
-            if f["type"] == "window":
-                material_library.library_glazing_materials[k] = GlazingMaterial(
-                    name=k,
-                    shgc=f["performance"]["shgc"],
-                    u_value=f["performance"]["u_value"],
-                    h_o=f.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
-                    category="Window/Skylight",
-                    is_library=True
-                )
-                logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}")
+            material_library.library_glazing_materials[k] = GlazingMaterial(
+                name=k,
+                shgc=f["performance"]["shgc"],
+                u_value=f["performance"]["u_value"],
+                h_o=f.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
+                is_library=True
+            )
+            logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}")
         except KeyError as e:
             logger.error(f"Error processing fenestration {k}: Missing key {e}")
             continue
@@ -315,63 +293,30 @@ def initialize_materials_and_fenestrations():
         }
         logger.info(f"Initialized materials in session state with {len(SAMPLE_MATERIALS)} materials")
     if "fenestrations" not in st.session_state.project_data:
-        # Move doors from fenestrations to materials
-        fenestrations = dict(SAMPLE_FENESTRATIONS)
-        doors = {k: v for k, v in fenestrations.items() if v["type"] == "door"}
-        windows = {k: v for k, v in fenestrations.items() if v["type"] == "window"}
         st.session_state.project_data["fenestrations"] = {
-            "library": windows,
+            "library": dict(SAMPLE_FENESTRATIONS),
             "project": {}
         }
-        # Add doors to materials
-        for k, v in doors.items():
-            try:
-                st.session_state.project_data["materials"]["library"][k] = {
-                    "category": "Door",
-                    "thermal_properties": {
-                        "conductivity": v["thermal_properties"].get("conductivity", 0.0),
-                        "density": v["thermal_properties"].get("density", 1000.0),
-                        "specific_heat": v["thermal_properties"].get("specific_heat", 1000.0)
-                    },
-                    "default_thickness": v.get("default_thickness", 0.05),
-                    "embodied_carbon": v.get("embodied_carbon", 0.5),
-                    "cost": {
-                        "material": v["cost"].get("material", 100.0),
-                        "labor": v["cost"].get("labor", 30.0),
-                        "replacement_years": v["cost"].get("replacement_years", 25)
-                    },
-                    "absorptivity": v.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
-                    "emissivity": v.get("emissivity", DEFAULT_DOOR_PROPERTIES["emissivity"]),
-                    "performance": {
-                        "u_value": v["performance"].get("u_value", 5.0)
-                    },
-                    "description": v.get("description", f"{k} for door applications")
-                }
-                logger.debug(f"Moved door {k} to materials library")
-            except KeyError as e:
-                logger.error(f"Error moving door {k} to materials: Missing key {e}")
-                continue
-        logger.info(f"Initialized fenestrations in session state with {len(windows)} fenestrations")
-        logger.info(f"Moved {len(doors)} doors to materials library")
+        logger.info(f"Initialized fenestrations in session state with {len(SAMPLE_FENESTRATIONS)} fenestrations")
 
 def display_materials_tab(material_library: MaterialLibrary):
-    """Display the materials tab content with two-column layout, including doors."""
+    """Display the materials tab content with two-column layout."""
     col1, col2 = st.columns([3, 2])
     with col1:
-        st.subheader("Materials and Doors")
+        st.subheader("Materials")
         # Category filter
         filter_options = ["All", "None"] + MATERIAL_CATEGORIES
         category = st.selectbox("Filter by Category", filter_options, key="material_filter")
 
-        st.subheader("Library Materials and Doors")
+        st.subheader("Library Materials")
         with st.container():
             library_materials = list(material_library.library_materials.values())
             if not library_materials:
-                st.warning("No library materials or doors loaded. Check data initialization.")
+                st.warning("No library materials loaded. Check data initialization.")
                 # Fallback: Display raw material names from session state
                 raw_materials = st.session_state.project_data["materials"]["library"]
                 if raw_materials:
-                    st.write("Raw material and door names available in session state:")
+                    st.write("Raw material names available in session state:")
                     st.write(list(raw_materials.keys()))
             if category == "None":
                 library_materials = []
@@ -383,7 +328,7 @@ def display_materials_tab(material_library: MaterialLibrary):
             cols[2].write("**U-Value (W/m²·K)**")
             cols[3].write("**Preview**")
             cols[4].write("**Clone**")
-            for material in library_materials:
+            for material in library acque:
                 cols = st.columns([2, 1, 1, 1, 1])
                 cols[0].write(material.name)
                 cols[1].write(material.get_thermal_mass())
@@ -402,7 +347,6 @@ def display_materials_tab(material_library: MaterialLibrary):
                             "absorptivity": material.absorptivity,
                             "price": material.price,
                             "emissivity": material.emissivity,
-                            "u_value": material.u_value,
                             "is_edit": False,
                             "edit_source": "library"
                         }
@@ -416,8 +360,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                             "embodied_carbon": material.embodied_carbon,
                             "absorptivity": material.absorptivity,
                             "price": material.price,
-                            "emissivity": material.emissivity,
-                            "u_value": material.u_value
+                            "emissivity": material.emissivity
                         }
                         st.session_state.active_tab = "Materials"
                 if cols[4].button("Clone", key=f"copy_lib_mat_{material.name}"):
@@ -437,8 +380,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                         absorptivity=material.absorptivity,
                         price=material.price,
                         emissivity=material.emissivity,
-                        is_library=False,
-                        u_value=material.u_value
+                        is_library=False
                     )
                     success, message = material_library.add_project_material(new_material, st.session_state.project_data["materials"]["project"])
                     if success:
@@ -447,7 +389,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                     else:
                         st.error(message)
 
-        st.subheader("Project Materials and Doors")
+        st.subheader("Project Materials")
         with st.container():
             if st.session_state.project_data["materials"]["project"]:
                 cols = st.columns([2, 1, 1, 1, 1])
@@ -475,7 +417,6 @@ def display_materials_tab(material_library: MaterialLibrary):
                                 "absorptivity": material.absorptivity,
                                 "price": material.price,
                                 "emissivity": material.emissivity,
-                                "u_value": material.u_value,
                                 "is_edit": True,
                                 "edit_source": "project",
                                 "original_name": material.name
@@ -490,8 +431,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                                 "embodied_carbon": material.embodied_carbon,
                                 "absorptivity": material.absorptivity,
                                 "price": material.price,
-                                "emissivity": material.emissivity,
-                                "u_value": material.u_value
+                                "emissivity": material.emissivity
                             }
                             st.session_state.active_tab = "Materials"
                     if cols[4].button("Delete", key=f"delete_mat_{material.name}"):
@@ -504,21 +444,21 @@ def display_materials_tab(material_library: MaterialLibrary):
                         else:
                             st.error(message)
             else:
-                st.write("No project materials or doors added.")
+                st.write("No project materials added.")
 
-        st.subheader("Project Materials and Doors")
+        st.subheader("Project Materials")
         try:
             material_df = material_library.to_dataframe("materials", project_materials=st.session_state.project_data["materials"]["project"])
             if not material_df.empty:
                 st.dataframe(material_df, use_container_width=True)
             else:
-                st.write("No project materials or doors to display.")
+                st.write("No project materials to display.")
         except Exception as e:
-            st.error(f"Error displaying project materials and doors: {str(e)}")
-            st.write("No project materials or doors to display.")
+            st.error(f"Error displaying project materials: {str(e)}")
+            st.write("No project materials to display.")
 
     with col2:
-        st.subheader("Material and Door Editor/Creator")
+        st.subheader("Material Editor/Creator")
         with st.container():
             with st.form("material_editor_form", clear_on_submit=False):
                 editor_state = st.session_state.get("material_editor", {})
@@ -532,15 +472,14 @@ def display_materials_tab(material_library: MaterialLibrary):
                     "embodied_carbon": 0.5,
                     "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                     "price": 50.0,
-                    "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"],
-                    "u_value": 5.0
+                    "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"]
                 })
                 is_edit = editor_state.get("is_edit", False)
                 original_name = editor_state.get("original_name", "")
                 name = st.text_input(
-                    "Material/Door Name",
+                    "Material Name",
                     value=form_state.get("name", editor_state.get("name", "")),
-                    help="Unique material or door identifier",
+                    help="Unique material identifier",
                     key="material_name_input"
                 )
                 filter_category = st.session_state.get("material_filter", "All")
@@ -552,26 +491,9 @@ def display_materials_tab(material_library: MaterialLibrary):
                     "Category",
                     MATERIAL_CATEGORIES,
                     index=category_index,
-                    help="Material or door type classification",
+                    help="Material type classification",
                     key="material_category_input"
                 )
-                u_value = None
-                if category == "Door":
-                    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", 5.0)),
-                        help="Thermal transmittance for doors",
-                        key="material_u_value_input"
-                    )
-                else:
-                    conductivity = st.number_input(
-                        "Conductivity (W/m·K)",
-                        min_value=0.01,
-                        value=form_state.get("conductivity", editor_state.get("conductivity", 0.1)),
-                        help="Thermal conductivity",
-                        key="material_conductivity_input"
-                    )
                 density = st.number_input(
                     "Density (kg/m³)",
                     min_value=1.0,
@@ -624,34 +546,34 @@ def display_materials_tab(material_library: MaterialLibrary):
                     key="material_emissivity_input"
                 )
 
-                if st.form_submit_button("Save Material/Door"):
+                if st.form_submit_button("Save Material"):
                     action_id = str(uuid.uuid4())
                     if st.session_state.material_action.get("id") != action_id:
                         st.session_state.material_action = {"action": "save", "id": action_id}
                         st.session_state.material_form_state = {
                             "name": name,
                             "category": category,
-                            "conductivity": conductivity if category != "Door" else 0.0,
                             "density": density,
                             "specific_heat": specific_heat,
                             "default_thickness": default_thickness,
                             "embodied_carbon": embodied_carbon,
                             "absorptivity": absorptivity,
                             "price": price,
-                            "emissivity": emissivity,
-                            "u_value": u_value
+                            "emissivity": emissivity
                         }
                         if not name or not name.strip():
-                            st.error("Material/Door name cannot be empty.")
+                            st.error("Material name cannot be empty.")
                         elif (name in st.session_state.project_data["materials"]["project"] or
                               name in st.session_state.project_data["materials"]["library"]) and (not is_edit or name != original_name):
-                            st.error(f"Material/Door '{name}' already exists.")
+                            st.error(f"Material '{name}' already exists.")
                         else:
                             try:
+                                # Use default conductivity from library or a fallback value
+                                conductivity = form_state.get("conductivity", editor_state.get("conductivity", 0.1))
                                 new_material = Material(
                                     name=name,
                                     category=MaterialCategory[category.upper().replace("-", "_")],
-                                    conductivity=0.0 if category == "Door" else conductivity,
+                                    conductivity=conductivity,
                                     density=density,
                                     specific_heat=specific_heat,
                                     default_thickness=default_thickness,
@@ -659,8 +581,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                                     absorptivity=absorptivity,
                                     price=price,
                                     emissivity=emissivity,
-                                    is_library=False,
-                                    u_value=u_value if category == "Door" else None
+                                    is_library=False
                                 )
                                 if is_edit and editor_state.get("edit_source") == "project":
                                     success, message = material_library.edit_project_material(
@@ -674,32 +595,27 @@ def display_materials_tab(material_library: MaterialLibrary):
                                     st.session_state.material_form_state = {
                                         "name": "",
                                         "category": "Insulation",
-                                        "conductivity": 0.1,
                                         "density": 1000.0,
                                         "specific_heat": 1000.0,
                                         "default_thickness": 0.1,
                                         "embodied_carbon": 0.5,
                                         "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                                         "price": 50.0,
-                                        "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"],
-                                        "u_value": 5.0
+                                        "emissivity": DEFAULT_MATERIAL_PAGE["emissivity"]
                                     }
                                     st.session_state.material_action = {"action": None, "id": None}
                                     st.session_state.rerun_trigger = None
                                     st.session_state.materials_rerun_pending = True
                                 else:
-                                    st.error(f"Failed to save material/door: {message}")
+                                    st.error(f"Failed to save material: {message}")
                             except Exception as e:
-                                st.error(f"Error saving material/door: {str(e)}")
+                                st.error(f"Error saving material: {str(e)}")
 
 def display_fenestrations_tab(material_library: MaterialLibrary):
-    """Display the fenestrations tab content with two-column layout, excluding doors."""
+    """Display the fenestrations tab content with two-column layout."""
     col1, col2 = st.columns([3, 2])
     with col1:
-        st.subheader("Fenestrations (Windows/Skylights)")
-        filter_options = ["All", "None"] + FENESTRATION_TYPES
-        fenestration_filter = st.selectbox("Filter Fenestrations", filter_options, key="fenestration_filter")
-
+        st.subheader("Fenestrations")
         st.subheader("Library Fenestrations")
         with st.container():
             library_fenestrations = list(material_library.library_glazing_materials.values())
@@ -709,10 +625,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                 if raw_fenestrations:
                     st.write("Raw fenestration names available in session state:")
                     st.write(list(raw_fenestrations.keys()))
-            if fenestration_filter == "None":
-                library_fenestrations = []
-            elif fenestration_filter != "All":
-                library_fenestrations = [f for f in library_fenestrations if f.category == fenestration_filter]
             cols = st.columns([2, 1, 1, 1, 1])
             cols[0].write("**Name**")
             cols[1].write("**SHGC**")
@@ -729,7 +641,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         st.session_state.rerun_trigger = f"preview_fen_{fenestration.name}"
                         st.session_state.fenestration_editor = {
                             "name": fenestration.name,
-                            "category": fenestration.category,
                             "shgc": fenestration.shgc,
                             "u_value": fenestration.u_value,
                             "h_o": fenestration.h_o,
@@ -738,7 +649,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         }
                         st.session_state.fenestration_form_state = {
                             "name": fenestration.name,
-                            "category": fenestration.category,
                             "shgc": fenestration.shgc,
                             "u_value": fenestration.u_value,
                             "h_o": fenestration.h_o
@@ -755,7 +665,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         shgc=fenestration.shgc,
                         u_value=fenestration.u_value,
                         h_o=fenestration.h_o,
-                        category=fenestration.category,
                         is_library=False
                     )
                     st.session_state.project_data["fenestrations"]["project"][new_name] = new_fenestration
@@ -781,7 +690,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             st.session_state.rerun_trigger = f"edit_fen_{fenestration.name}"
                             st.session_state.fenestration_editor = {
                                 "name": fenestration.name,
-                                "category": fenestration.category,
                                 "shgc": fenestration.shgc,
                                 "u_value": fenestration.u_value,
                                 "h_o": fenestration.h_o,
@@ -791,9 +699,8 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                             }
                             st.session_state.fenestration_form_state = {
                                 "name": fenestration.name,
-                                "category": fenestration.category,
                                 "shgc": fenestration.shgc,
-                                "u_value": fenestration.u_value,
+                                "d": fenestration.u_value,
                                 "h_o": fenestration.h_o
                             }
                             st.session_state.active_tab = "Fenestrations"
@@ -818,7 +725,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     fenestration_data = [
                         {
                             "Name": f.name,
-                            "Category": f.category,
                             "SHGC": f.shgc,
                             "U-Value (W/m²·K)": f.u_value,
                             "Exterior Conductance (W/m²·K)": f.h_o
@@ -843,33 +749,23 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                 editor_state = st.session_state.get("fenestration_editor", {})
                 form_state = st.session_state.get("fenestration_form_state", {
                     "name": "",
-                    "category": "Window/Skylight",
                     "shgc": 0.7,
                     "u_value": 5.0,
                     "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
                 })
                 is_edit = editor_state.get("is_edit", False)
-                default_category = editor_state.get("category", "Window/Skylight")
-                category_index = (FENESTRATION_TYPES.index(default_category)
-                                 if default_category in FENESTRATION_TYPES else 0)
+                original_name = editor_state.get("original_name", "")
                 name = st.text_input(
                     "Fenestration Name",
                     value=form_state.get("name", editor_state.get("name", "")),
                     help="Unique fenestration identifier",
                     key="fenestration_name_input"
                 )
-                category = st.selectbox(
-                    "Category",
-                    FENESTRATION_TYPES,
-                    index=category_index,
-                    help="Fenestration type (Window/Skylight)",
-                    key="fenestration_category_input"
-                )
                 shgc = st.number_input(
                     "Solar Heat Gain Coefficient (SHGC)",
                     min_value=0.0,
                     max_value=1.0,
-                    value=form_state.get("shgc", editor_state.get("shgc", 0.0)),
+                    value=form_state.get("shgc", editor_state.get("shgc", 0.7)),
                     help="Fraction of solar radiation admitted",
                     key="fenestration_shgc_input"
                 )
@@ -894,7 +790,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                         st.session_state.fenestration_action = {"action": "save", "id": action_id}
                         st.session_state.fenestration_form_state = {
                             "name": name,
-                            "category": category,
                             "shgc": shgc,
                             "u_value": u_value,
                             "h_o": h_o
@@ -911,7 +806,6 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                     shgc=shgc,
                                     u_value=u_value,
                                     h_o=h_o,
-                                    category=category,
                                     is_library=False
                                 )
                                 if is_edit and editor_state.get("edit_source") == "project":
@@ -920,17 +814,16 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                                 else:
                                     st.session_state.project_data["fenestrations"]["project"][name] = new_fenestration
                                     st.success(f"Fenestration '{name}' added successfully!")
-                                st.session_state.fenestrations_editor = {}
-                                st.session_state.fenestrations_form_state = {
+                                st.session_state.fenestration_editor = {}
+                                st.session_state.fenestration_form_state = {
                                     "name": "",
-                                    "category": "Window/Skylight",
-                                    "shgc""": 0.7,
+                                    "shgc": 0.7,
                                     "u_value": 5.0,
                                     "h_o": DEFAULT_WINDOW_PROPERTIES["h_o"]
                                 }
-                                st.session_state.fenestrations_action = {"action": None, "id": None}
+                                st.session_state.fenestration_action = {"action": None, "id": None}
                                 st.session_state.rerun_trigger = None
-                                st.session_state.materials_rerun_triggered = True
+                                st.session_state.materials_rerun_pending = True
                             except Exception as e:
                                 st.error(f"Error saving fenestration: {str(e)}")
 
@@ -943,31 +836,9 @@ def get_available_materials():
     return materials
 
 def get_available_fenestrations():
-    """Get all available fenestrations (library + project windows + doors from materials) for use in other modules."""
+    """Get all available fenestrations (library + project) for use in other modules."""
     fenestrations = {}
     if "fenestrations" in st.session_state.project_data:
         fenestrations.update(st.session_state.project_data["fenestrations"]["library"])
         fenestrations.update(st.session_state.project_data["fenestrations"]["project"])
-    # Include doors from materials as fenestrations for compatibility
-    if "materials" in st.session_state.project_data["materials"]:
-        for k, m in st.session_state.project_data["materials"]["library"].items():
-            if m.get("category") == "Door":
-                fenestrations[k] = GlazingMaterial(
-                    name=k,
-                    shgc=0.0,
-                    u_value=m.get("performance", {}).get("u_value", 5.0),
-                    h_o=m.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
-                    category="Door",
-                    is_library=True
-                )
-        for k, m in st.session_state.project_data["materials"]["project"].items():
-            if isinstance(m, Material) and m.category == MaterialCategory.DOOR:
-                fenestrations[k] = GlazingMaterial(
-                    name=k,
-                    shgc=0.0,
-                    u_value=m.u_value if m.u_value is not None else 5.0,
-                    h_o=DEFAULT_WINDOW_PROPERTIES["h_o"],
-                    category="Door",
-                    is_library=False
-                )
     return fenestrations