Update app/internal_loads.py

app/internal_loads.py

@@ -188,13 +188,6 @@ def display_people_tab():
                 help="Select the occupancy schedule for this group."
             )
             
-            # Zone assignment
-            zone = st.text_input(
-                "Zone",
-                value=editor_state.get("zone", "Whole Building"),
-                help="Zone or area where this people group is located."
-            )
-            
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
@@ -229,9 +222,8 @@ def display_people_tab():
                 "clo_summer": clo_summer,
                 "clo_winter": clo_winter,
                 "schedule": schedule,
-                "zone": zone,
                 "sensible_heat_per_person": (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2,
-                "latent_heat_per_person": (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2,
+                "latent_heat_per_person": (activity_data["latent_so_w"] + activity_data["latent_max_w"]) / 2,
                 "total_sensible_heat": num_people * (activity_data["sensible_min_w"] + activity_data["sensible_max_w"]) / 2,
                 "total_latent_heat": num_people * (activity_data["latent_min_w"] + activity_data["latent_max_w"]) / 2
             }
@@ -349,13 +341,6 @@ def display_lighting_tab():
                 help="Select the lighting schedule for this system."
             )
             
-            # Zone assignment
-            zone = st.text_input(
-                "Zone",
-                value=editor_state.get("zone", "Whole Building"),
-                help="Zone or area where this lighting system is located."
-            )
-            
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
@@ -389,8 +374,7 @@ def display_lighting_tab():
                 "total_power": area * lpd,
                 "radiative_fraction": radiative_fraction,
                 "convective_fraction": convective_fraction,
-                "schedule": schedule,
-                "zone": zone
+                "schedule": schedule
             }
             
             # Handle edit mode
@@ -520,13 +504,6 @@ def display_equipment_tab():
                 help="Select the equipment schedule."
             )
             
-            # Zone assignment
-            zone = st.text_input(
-                "Zone",
-                value=editor_state.get("zone", "Whole Building"),
-                help="Zone or area where this equipment is located."
-            )
-            
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
@@ -562,8 +539,7 @@ def display_equipment_tab():
                 "total_latent_power": area * latent_gain,
                 "radiative_fraction": radiative_fraction,
                 "convective_fraction": convective_fraction,
-                "schedule": schedule,
-                "zone": zone
+                "schedule": schedule
             }
             
             # Handle edit mode
@@ -676,13 +652,6 @@ def display_ventilation_infiltration_tab():
                 help="Select the operation schedule for this system."
             )
             
-            # Zone assignment
-            zone = st.text_input(
-                "Zone",
-                value=editor_state.get("zone", "Whole Building"),
-                help="Zone or area where this system operates."
-            )
-            
             # Submit buttons
             col1, col2 = st.columns(2)
             with col1:
@@ -712,8 +681,7 @@ def display_ventilation_infiltration_tab():
                 "area": area,
                 "ventilation_rate": ventilation_rate,
                 "air_change_rate": air_change_rate,
-                "schedule": schedule,
-                "zone": zone
+                "schedule": schedule
             }
             
             # Handle edit mode
@@ -978,27 +946,25 @@ def is_schedule_in_use(schedule_name: str) -> bool:
 def display_people_table(people_groups: List[Dict[str, Any]]):
     """Display people groups in a table format with edit/delete buttons."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**Number**")
     cols[2].write("**Sensible (W)**")
     cols[3].write("**Latent (W)**")
-    cols[4].write("**Zone**")
-    cols[5].write("**Edit**")
-    cols[6].write("**Delete**")
+    cols[4].write("**Edit**")
+    cols[5].write("**Delete**")
     
     # Display each group
     for idx, group in enumerate(people_groups):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1])
         cols[0].write(group["name"])
         cols[1].write(str(group.get("num_people", 0)))
         cols[2].write(f"{group.get('total_sensible_heat', 0):.1f}")
         cols[3].write(f"{group.get('total_latent_heat', 0):.1f}")
-        cols[4].write(group.get("zone", "Unknown"))
         
         # Edit button
         edit_key = f"edit_people_{group['name']}_{idx}"
-        with cols[5].container():
+        with cols[4].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.people_editor = {
                     "index": idx,
@@ -1008,7 +974,6 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
                     "clo_summer": group.get("clo_summer", 0.5),
                     "clo_winter": group.get("clo_winter", 1.0),
                     "schedule": group.get("schedule", "Continuous"),
-                    "zone": group.get("zone", "Whole Building"),
                     "is_edit": True
                 }
                 st.session_state.people_action = {"action": "edit", "id": str(uuid.uuid4())}
@@ -1016,7 +981,7 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
         
         # Delete button
         delete_key = f"delete_people_{group['name']}_{idx}"
-        with cols[6].container():
+        with cols[5].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["people"].pop(idx)
                 st.success(f"People Group '{group['name']}' deleted!")
@@ -1026,27 +991,25 @@ def display_people_table(people_groups: List[Dict[str, Any]]):
 def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
     """Display lighting systems in a table format with edit/delete buttons."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**Area (m²)**")
     cols[2].write("**LPD (W/m²)**")
     cols[3].write("**Total Power (W)**")
-    cols[4].write("**Zone**")
-    cols[5].write("**Edit**")
-    cols[6].write("**Delete**")
+    cols[4].write("**Edit**")
+    cols[5].write("**Delete**")
     
     # Display each system
     for idx, system in enumerate(lighting_systems):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1])
         cols[0].write(system["name"])
         cols[1].write(f"{system.get('area', 0):.1f}")
         cols[2].write(f"{system.get('lpd', 0):.2f}")
         cols[3].write(f"{system.get('total_power', 0):.1f}")
-        cols[4].write(system.get("zone", "Unknown"))
         
         # Edit button
         edit_key = f"edit_lighting_{system['name']}_{idx}"
-        with cols[5].container():
+        with cols[4].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.lighting_editor = {
                     "index": idx,
@@ -1056,7 +1019,6 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
                     "radiative_fraction": system.get("radiative_fraction", 0.4),
                     "convective_fraction": system.get("convective_fraction", 0.6),
                     "schedule": system.get("schedule", "Continuous"),
-                    "zone": system.get("zone", "Whole Building"),
                     "is_edit": True
                 }
                 st.session_state.lighting_action = {"action": "edit", "id": str(uuid.uuid4())}
@@ -1064,7 +1026,7 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
         
         # Delete button
         delete_key = f"delete_lighting_{system['name']}_{idx}"
-        with cols[6].container():
+        with cols[5].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["lighting"].pop(idx)
                 st.success(f"Lighting System '{system['name']}' deleted!")
@@ -1074,27 +1036,25 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
 def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
     """Display equipment systems in a table format with edit/delete buttons."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**Area (m²)**")
     cols[2].write("**Sensible (W)**")
     cols[3].write("**Latent (W)**")
-    cols[4].write("**Zone**")
-    cols[5].write("**Edit**")
-    cols[6].write("**Delete**")
+    cols[4].write("**Edit**")
+    cols[5].write("**Delete**")
     
     # Display each system
     for idx, system in enumerate(equipment_systems):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1])
         cols[0].write(system["name"])
         cols[1].write(f"{system.get('area', 0):.1f}")
         cols[2].write(f"{system.get('total_sensible_power', 0):.1f}")
         cols[3].write(f"{system.get('total_latent_power', 0):.1f}")
-        cols[4].write(system.get("zone", "Unknown"))
         
         # Edit button
         edit_key = f"edit_equipment_{system['name']}_{idx}"
-        with cols[5].container():
+        with cols[4].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.equipment_editor = {
                     "index": idx,
@@ -1105,7 +1065,6 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
                     "radiative_fraction": system.get("radiative_fraction", 0.5),
                     "convective_fraction": system.get("convective_fraction", 0.5),
                     "schedule": system.get("schedule", "Continuous"),
-                    "zone": system.get("zone", "Whole Building"),
                     "is_edit": True
                 }
                 st.session_state.equipment_action = {"action": "edit", "id": str(uuid.uuid4())}
@@ -1113,7 +1072,7 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
         
         # Delete button
         delete_key = f"delete_equipment_{system['name']}_{idx}"
-        with cols[6].container():
+        with cols[5].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["equipment"].pop(idx)
                 st.success(f"Equipment '{system['name']}' deleted!")
@@ -1123,28 +1082,26 @@ def display_equipment_table(equipment_systems: List[Dict[str, Any]]):
 def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]]):
     """Display ventilation/infiltration systems in a table format with edit/delete buttons."""
     # Create column headers
-    cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+    cols = st.columns([2, 1, 1, 1, 1, 1])
     cols[0].write("**Name**")
     cols[1].write("**Type**")
     cols[2].write("**Area (m²)**")
     cols[3].write("**Rate**")
-    cols[4].write("**Zone**")
-    cols[5].write("**Edit**")
-    cols[6].write("**Delete**")
+    cols[4].write("**Edit**")
+    cols[5].write("**Delete**")
     
     # Display each system
     for idx, system in enumerate(vent_inf_systems):
-        cols = st.columns([2, 1, 1, 1, 1, 1, 1])
+        cols = st.columns([2, 1, 1, 1, 1, 1])
         cols[0].write(system["name"])
         cols[1].write(system.get("system_type", "Unknown"))
         cols[2].write(f"{system.get('area', 0):.1f}")
         rate_info = f"{system.get('ventilation_rate', 0):.2f} L/s·m²" if system.get("system_type") == "Ventilation" else f"{system.get('air_change_rate', 0):.2f} ACH"
         cols[3].write(rate_info)
-        cols[4].write(system.get("zone", "Unknown"))
         
         # Edit button
         edit_key = f"edit_vent_inf_{system['name']}_{idx}"
-        with cols[5].container():
+        with cols[4].container():
             if st.button("Edit", key=edit_key):
                 st.session_state.vent_inf_editor = {
                     "index": idx,
@@ -1154,7 +1111,6 @@ def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]
                     "ventilation_rate": system.get("ventilation_rate", 10.0),
                     "air_change_rate": system.get("air_change_rate", 1.0),
                     "schedule": system.get("schedule", "Continuous"),
-                    "zone": system.get("zone", "Whole Building"),
                     "is_edit": True
                 }
                 st.session_state.vent_inf_action = {"action": "edit", "id": str(uuid.uuid4())}
@@ -1162,7 +1118,7 @@ def display_ventilation_infiltration_table(vent_inf_systems: List[Dict[str, Any]
         
         # Delete button
         delete_key = f"delete_vent_inf_{system['name']}_{idx}"
-        with cols[6].container():
+        with cols[5].container():
             if st.button("Delete", key=delete_key):
                 st.session_state.project_data["internal_loads"]["ventilation_infiltration"].pop(idx)
                 st.success(f"{system.get('system_type', 'System')} '{system['name']}' deleted!")