Update app/materials_library.py

app/materials_library.py

@@ -2,8 +2,9 @@
 BuildSustain - Material Library Module
 
 This module handles the material library functionality of the BuildSustain application,
-allowing users to manage building materials and fenestrations (windows, skylights, doors).
-It provides both predefined library materials and the ability to create project-specific materials.
+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.
 
 Developed by: Dr Majed Abuseif, Deakin University
 © 2025
@@ -30,12 +31,12 @@ MATERIAL_CATEGORIES = [
     "Insulation",
     "Structural",
     "Finishing",
-    "Sub-Structural"
+    "Sub-Structural",
+    "Door"
 ]
 
 FENESTRATION_TYPES = [
-    "Window/Skylight",
-    "Door"
+    "Window/Skylight"
 ]
 
 # Surface resistances (EN ISO 6946 or ASHRAE standards)
@@ -47,11 +48,13 @@ 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):
+                 absorptivity: float, price: float, emissivity: float, is_library: bool = True,
+                 u_value: Optional[float] = None):
         self.name = name
         self.category = category
         self.conductivity = conductivity
@@ -63,9 +66,12 @@ 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:
@@ -76,6 +82,9 @@ 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
@@ -157,6 +166,9 @@ 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:
@@ -168,7 +180,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 and fenestrations for thermal analysis.")
+    st.write("Manage building materials (including doors) and fenestrations for thermal analysis.")
 
     # CSS for box heights, scrolling, and visual appeal
     st.markdown("""
@@ -251,7 +263,8 @@ def display_materials_page():
                 absorptivity=m.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
                 price=m["cost"]["material"],
                 emissivity=m.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"]),
-                is_library=True
+                is_library=True,
+                u_value=m["performance"].get("u_value") if m.get("category") == "Door" else None
             )
             logger.debug(f"Loaded material: {k}, Category: {m['category']}")
         except (KeyError, ValueError) as e:
@@ -270,16 +283,7 @@ def display_materials_page():
                     category="Window/Skylight",
                     is_library=True
                 )
-            elif f["type"] == "door":
-                material_library.library_glazing_materials[k] = GlazingMaterial(
-                    name=k,
-                    shgc=0.0,
-                    u_value=f["performance"]["u_value"],
-                    h_o=f.get("h_o", DEFAULT_WINDOW_PROPERTIES["h_o"]),
-                    category="Door",
-                    is_library=True
-                )
-            logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}")
+                logger.debug(f"Loaded fenestration: {k}, Type: {f['type']}")
         except KeyError as e:
             logger.error(f"Error processing fenestration {k}: Missing key {e}")
             continue
@@ -311,30 +315,51 @@ 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": dict(SAMPLE_FENESTRATIONS),
+            "library": windows,
             "project": {}
         }
-        logger.info(f"Initialized fenestrations in session state with {len(SAMPLE_FENESTRATIONS)} fenestrations")
+        # Add doors to materials
+        for k, v in doors.items():
+            st.session_state.project_data["materials"]["library"][k] = {
+                "category": "Door",
+                "thermal_properties": {
+                    "conductivity": 0.0,  # Not used for doors
+                    "density": v.get("density", 1000.0),
+                    "specific_heat": v.get("specific_heat", 1000.0)
+                },
+                "thickness_range": {"default": v.get("thickness", 0.05)},
+                "embodied_carbon": v.get("embodied_carbon", 0.5),
+                "cost": {"material": v.get("cost", 100.0)},
+                "absorptivity": v.get("absorptivity", DEFAULT_MATERIAL_PROPERTIES["absorptivity"]),
+                "emissivity": v.get("emissivity", DEFAULT_MATERIAL_PROPERTIES["emissivity"]),
+                "performance": {"u_value": v["performance"]["u_value"]}
+            }
+        logger.info(f"Initialized fenestrations in session state with {len(windows)} fenestrations")
+        logger.info(f"Moved {len(doors)} doors to materials library")
 
 def display_materials_tab(material_library: MaterialLibrary):
-    """Display the materials tab content with two-column layout."""
+    """Display the materials tab content with two-column layout, including doors."""
     col1, col2 = st.columns([3, 2])
     with col1:
-        st.subheader("Materials")
+        st.subheader("Materials and Doors")
         # Category filter
         filter_options = ["All", "None"] + MATERIAL_CATEGORIES
         category = st.selectbox("Filter by Category", filter_options, key="material_filter")
 
-        st.subheader("Library Materials")
+        st.subheader("Library Materials and Doors")
         with st.container():
             library_materials = list(material_library.library_materials.values())
             if not library_materials:
-                st.warning("No library materials loaded. Check data initialization.")
+                st.warning("No library materials or doors 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 names available in session state:")
+                    st.write("Raw material and door names available in session state:")
                     st.write(list(raw_materials.keys()))
             if category == "None":
                 library_materials = []
@@ -365,6 +390,7 @@ 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"
                         }
@@ -378,7 +404,8 @@ def display_materials_tab(material_library: MaterialLibrary):
                             "embodied_carbon": material.embodied_carbon,
                             "absorptivity": material.absorptivity,
                             "price": material.price,
-                            "emissivity": material.emissivity
+                            "emissivity": material.emissivity,
+                            "u_value": material.u_value
                         }
                         st.session_state.active_tab = "Materials"
                 if cols[4].button("Clone", key=f"copy_lib_mat_{material.name}"):
@@ -398,7 +425,8 @@ def display_materials_tab(material_library: MaterialLibrary):
                         absorptivity=material.absorptivity,
                         price=material.price,
                         emissivity=material.emissivity,
-                        is_library=False
+                        is_library=False,
+                        u_value=material.u_value
                     )
                     success, message = material_library.add_project_material(new_material, st.session_state.project_data["materials"]["project"])
                     if success:
@@ -407,7 +435,7 @@ def display_materials_tab(material_library: MaterialLibrary):
                     else:
                         st.error(message)
 
-        st.subheader("Project Materials")
+        st.subheader("Project Materials and Doors")
         with st.container():
             if st.session_state.project_data["materials"]["project"]:
                 cols = st.columns([2, 1, 1, 1, 1])
@@ -435,6 +463,7 @@ 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
@@ -449,7 +478,8 @@ def display_materials_tab(material_library: MaterialLibrary):
                                 "embodied_carbon": material.embodied_carbon,
                                 "absorptivity": material.absorptivity,
                                 "price": material.price,
-                                "emissivity": material.emissivity
+                                "emissivity": material.emissivity,
+                                "u_value": material.u_value
                             }
                             st.session_state.active_tab = "Materials"
                     if cols[4].button("Delete", key=f"delete_mat_{material.name}"):
@@ -462,21 +492,21 @@ def display_materials_tab(material_library: MaterialLibrary):
                         else:
                             st.error(message)
             else:
-                st.write("No project materials added.")
+                st.write("No project materials or doors added.")
 
-        st.subheader("Project Materials")
+        st.subheader("Project Materials and Doors")
         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 to display.")
+                st.write("No project materials or doors to display.")
         except Exception as e:
-            st.error(f"Error displaying project materials: {str(e)}")
-            st.write("No project materials to display.")
+            st.error(f"Error displaying project materials and doors: {str(e)}")
+            st.write("No project materials or doors to display.")
 
     with col2:
-        st.subheader("Material Editor/Creator")
+        st.subheader("Material and Door Editor/Creator")
         with st.container():
             with st.form("material_editor_form", clear_on_submit=False):
                 editor_state = st.session_state.get("material_editor", {})
@@ -490,14 +520,15 @@ def display_materials_tab(material_library: MaterialLibrary):
                     "embodied_carbon": 0.5,
                     "absorptivity": DEFAULT_MATERIAL_PROPERTIES["absorptivity"],
                     "price": 50.0,
-                    "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"]
+                    "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"],
+                    "u_value": 5.0
                 })
                 is_edit = editor_state.get("is_edit", False)
                 original_name = editor_state.get("original_name", "")
                 name = st.text_input(
-                    "Material Name",
+                    "Material/Door Name",
                     value=form_state.get("name", editor_state.get("name", "")),
-                    help="Unique material identifier",
+                    help="Unique material or door identifier",
                     key="material_name_input"
                 )
                 filter_category = st.session_state.get("material_filter", "All")
@@ -509,9 +540,26 @@ def display_materials_tab(material_library: MaterialLibrary):
                     "Category",
                     MATERIAL_CATEGORIES,
                     index=category_index,
-                    help="Material type classification",
+                    help="Material or door 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,
@@ -564,34 +612,34 @@ def display_materials_tab(material_library: MaterialLibrary):
                     key="material_emissivity_input"
                 )
 
-                if st.form_submit_button("Save Material"):
+                if st.form_submit_button("Save Material/Door"):
                     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
+                            "emissivity": emissivity,
+                            "u_value": u_value
                         }
                         if not name or not name.strip():
-                            st.error("Material name cannot be empty.")
+                            st.error("Material/Door 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 '{name}' already exists.")
+                            st.error(f"Material/Door '{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=conductivity,
+                                    conductivity=0.0 if category == "Door" else conductivity,
                                     density=density,
                                     specific_heat=specific_heat,
                                     default_thickness=default_thickness,
@@ -599,7 +647,8 @@ def display_materials_tab(material_library: MaterialLibrary):
                                     absorptivity=absorptivity,
                                     price=price,
                                     emissivity=emissivity,
-                                    is_library=False
+                                    is_library=False,
+                                    u_value=u_value if category == "Door" else None
                                 )
                                 if is_edit and editor_state.get("edit_source") == "project":
                                     success, message = material_library.edit_project_material(
@@ -613,27 +662,29 @@ 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"]
+                                        "emissivity": DEFAULT_MATERIAL_PROPERTIES["emissivity"],
+                                        "u_value": 5.0
                                     }
                                     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: {message}")
+                                    st.error(f"Failed to save material/door: {message}")
                             except Exception as e:
-                                st.error(f"Error saving material: {str(e)}")
+                                st.error(f"Error saving material/door: {str(e)}")
 
 def display_fenestrations_tab(material_library: MaterialLibrary):
-    """Display the fenestrations tab content with two-column layout."""
+    """Display the fenestrations tab content with two-column layout, excluding doors."""
     col1, col2 = st.columns([3, 2])
     with col1:
-        st.subheader("Fenestrations")
+        st.subheader("Fenestrations (Windows/Skylights)")
         filter_options = ["All", "None"] + FENESTRATION_TYPES
         fenestration_filter = st.selectbox("Filter Fenestrations", filter_options, key="fenestration_filter")
 
@@ -802,7 +853,7 @@ def display_fenestrations_tab(material_library: MaterialLibrary):
                     "Category",
                     FENESTRATION_TYPES,
                     index=category_index,
-                    help="Fenestration type (Window/Skylight or Door)",
+                    help="Fenestration type (Window/Skylight)",
                     key="fenestration_category_input"
                 )
                 shgc = st.number_input(
@@ -883,9 +934,31 @@ def get_available_materials():
     return materials
 
 def get_available_fenestrations():
-    """Get all available fenestrations (library + project) for use in other modules."""
+    """Get all available fenestrations (library + project windows + doors from materials) 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:
+        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["performance"]["u_value"],
+                    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 m.category == MaterialCategory.DOOR:
+                fenestrations[k] = GlazingMaterial(
+                    name=k,
+                    shgc=0.0,
+                    u_value=m.u_value,
+                    h_o=DEFAULT_WINDOW_PROPERTIES["h_o"],
+                    category="Door",
+                    is_library=False
+                )
     return fenestrations