Update app/components.py

app/components.py

@@ -94,6 +94,14 @@ def migrate_component_types():
             if comp_type != "floors" and "tilt" in component:
                 component["surface_tilt"] = component.pop("tilt")
                 logger.info(f"Renamed 'tilt' to 'surface_tilt' for component '{component['name']}'")
+            # Add adiabatic and ground_contact if not present for walls and floors
+            if comp_type in ["walls", "floors"]:
+                if "adiabatic" not in component:
+                    component["adiabatic"] = False
+                    logger.info(f"Added 'adiabatic' to component '{component['name']}'")
+                if "ground_contact" not in component:
+                    component["ground_contact"] = False
+                    logger.info(f"Added 'ground_contact' to component '{component['name']}'")
 
 def display_component_tab(comp_type: str):
     """
@@ -203,16 +211,19 @@ def display_component_tab(comp_type: str):
                     help="Tilt angle of the component relative to horizontal (0° = horizontal, 90° = vertical)."
                 )
             
-            elif comp_type == "floors":
-                # Contact with ground percentage
-                contact_with_ground_percentage = st.number_input(
-                    "Contact with Ground (%)",
-                    min_value=0.0,
-                    max_value=100.0,
-                    value=float(editor_state.get("contact_with_ground_percentage", 0.0)),
-                    step=1.0,
-                    format="%.0f",
-                    help="Percentage of the floor in contact with the ground (0% = fully above ground, 100% = fully in contact)."
+            # Adiabatic and Ground Contact for walls and floors
+            if comp_type in ["walls", "floors"]:
+                adiabatic = st.selectbox(
+                    "Adiabatic",
+                    ["Yes", "No"],
+                    index=0 if editor_state.get("adiabatic", False) else 1,
+                    help="Select 'Yes' if the component is adiabatic (no heat transfer across it)."
+                )
+                ground_contact = st.selectbox(
+                    "Ground Contact",
+                    ["Yes", "No"],
+                    index=0 if editor_state.get("ground_contact", False) else 1,
+                    help="Select 'Yes' if the component is in contact with the ground."
                 )
             
             # Construction or fenestration selection
@@ -330,8 +341,9 @@ def display_component_tab(comp_type: str):
                 component_data["surface_azimuth"] = surface_azimuth
                 component_data["surface_tilt"] = surface_tilt
             
-            if comp_type == "floors":
-                component_data["contact_with_ground_percentage"] = contact_with_ground_percentage
+            if comp_type in ["walls", "floors"]:
+                component_data["adiabatic"] = adiabatic == "Yes"
+                component_data["ground_contact"] = ground_contact == "Yes"
             
             if comp_type in ["walls", "roofs", "floors"]:
                 component_data["construction"] = construction
@@ -390,15 +402,17 @@ def display_component_tab(comp_type: str):
 def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
     """Display a table of walls or windows with appropriate columns."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**U-Value**")
     cols[2].write("**Area (m²)**")
     cols[3].write("**Surface Azimuth (°)**")
     cols[4].write("**Surface Tilt (°)**")
     if comp_type == "walls":
-        cols[5].write("**Edit**")
-        cols[6].write("**Delete**")
+        cols[5].write("**Adiabatic**")
+        cols[6].write("**Ground Contact**")
+        cols[7].write("**Edit**")
+        cols[8].write("**Delete**")
     else:  # windows
         cols[5].write("**SC**")
         cols[6].write("**Edit**")
@@ -406,18 +420,19 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
     
     # Display each component
     for idx, comp in enumerate(components):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1, 1, 1] if comp_type == "walls" else [2, 1, 1, 1, 1, 1, 1, 1])
         cols[0].write(comp["name"])
         cols[1].write(f"{comp.get('u_value', 0.0):.3f}")
         cols[2].write(f"{comp['area']:.2f}")
         cols[3].write(f"{comp.get('surface_azimuth', 0.0):.0f}")
         cols[4].write(f"{comp.get('surface_tilt', 90.0):.0f}")
-        if comp_type == "windows":
-            cols[5].write(f"{comp.get('shading_coefficient', 1.0):.2f}")
+        if comp_type == "walls":
+            cols[5].write("Yes" if comp.get("adiabatic", False) else "No")
+            cols[6].write("Yes" if comp.get("ground_contact", False) else "No")
         
         # Edit button
         edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
-        edit_col = 5 if comp_type == "walls" else 6
+        edit_col = 7 if comp_type == "walls" else 6
         with cols[edit_col].container():
             if st.button("Edit", key=edit_key):
                 editor_data = {
@@ -432,6 +447,8 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
                 
                 if comp_type == "walls":
                     editor_data["construction"] = comp.get("construction", "")
+                    editor_data["adiabatic"] = comp.get("adiabatic", False)
+                    editor_data["ground_contact"] = comp.get("ground_contact", False)
                 else:  # windows
                     editor_data["fenestration"] = comp.get("fenestration", "")
                     editor_data["parent_component"] = comp.get("parent_component", "")
@@ -444,7 +461,7 @@ def display_wall_window_table(comp_type: str, components: List[Dict[str, Any]]):
         
         # Delete button
         delete_key = f"delete_{comp_type}_{comp['name']}_{idx}"
-        delete_col = 6 if comp_type == "walls" else 7
+        delete_col = 8 if comp_type == "walls" else 7
         with cols[delete_col].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["components"][comp_type].pop(idx)
@@ -520,32 +537,35 @@ def display_roof_skylight_table(comp_type: str, components: List[Dict[str, Any]]
 def display_floor_table(comp_type: str, components: List[Dict[str, Any]]):
     """Display a table of floors with appropriate columns."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**U-Value**")
     cols[2].write("**Area (m²)**")
-    cols[3].write("**Contact with Ground (%)**")
-    cols[4].write("**Edit**")
-    cols[5].write("**Delete**")
+    cols[3].write("**Adiabatic**")
+    cols[4].write("**Ground Contact**")
+    cols[5].write("**Edit**")
+    cols[6].write("**Delete**")
     
     # Display each component
     for idx, comp in enumerate(components):
-        cols = st.columns([2, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
         cols[0].write(comp["name"])
         cols[1].write(f"{comp.get('u_value', 0.0):.3f}")
         cols[2].write(f"{comp['area']:.2f}")
-        cols[3].write(f"{comp.get('contact_with_ground_percentage', 0.0):.0f}")
+        cols[3].write("Yes" if comp.get("adiabatic", False) else "No")
+        cols[4].write("Yes" if comp.get("ground_contact", False) else "No")
         
         # Edit button
         edit_key = f"edit_{comp_type}_{comp['name']}_{idx}"
-        with cols[4].container():
+        with cols[5].container():
             if st.button("Edit", key=edit_key):
                 editor_data = {
                     "index": idx,
                     "name": comp["name"],
                     "area": comp["area"],
                     "construction": comp.get("construction", ""),
-                    "contact_with_ground_percentage": comp.get("contact_with_ground_percentage", 0.0),
+                    "adiabatic": comp.get("adiabatic", False),
+                    "ground_contact": comp.get("ground_contact", False),
                     "is_edit": True
                 }
                 
@@ -555,7 +575,7 @@ def display_floor_table(comp_type: str, components: List[Dict[str, Any]]):
         
         # Delete button
         delete_key = f"delete_{comp_type}_{comp['name']}_{idx}"
-        with cols[5].container():
+        with cols[6].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["components"][comp_type].pop(idx)
                 st.success(f"{comp_type[:-1].capitalize()} '{comp['name']}' deleted!")
@@ -668,6 +688,8 @@ def display_components_help():
     * **Surface Tilt**: Angle of the component relative to horizontal (0° = horizontal, 90° = vertical).
     * **Parent Component**: The wall or roof that contains a window or skylight.
     * **Shading Coefficient (SC)**: Factor for shading devices on windows/skylights (0.0 to 1.0).
+    * **Adiabatic**: Indicates if a wall or floor has no heat transfer across it (Yes/No).
+    * **Ground Contact**: Indicates if a wall or floor is in contact with the ground (Yes/No).
     
     **Workflow:**
     
@@ -681,4 +703,6 @@ def display_components_help():
     * For roofs and skylights, set surface tilt to 0° for flat surfaces.
     * Ensure the total area of windows doesn't exceed the area of their parent walls.
     * Ensure the total area of skylights doesn't exceed the area of their parent roofs.
+    * Set adiabatic to 'Yes' for components with no heat transfer, such as internal partitions.
+    * Set ground contact to 'Yes' for components in direct contact with the ground for accurate heat transfer calculations.
     """)