Update app/internal_loads.py

app/internal_loads.py

@@ -406,9 +406,10 @@ def display_equipment_tab():
         if "equipment_action" not in st.session_state:
             st.session_state.equipment_action = {"action": None, "id": None}
         
-        # Get building type for default values
+        # Get building type and corresponding schedule type for default values
         building_type = st.session_state.project_data["building_info"].get("building_type")
-        default_equipment_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])["equipment_heat_gains"]
+        schedule_type = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])["schedule_type"]
+        default_equipment_data = DEFAULT_EQUIPMENT_LOADS.get(schedule_type, DEFAULT_EQUIPMENT_LOADS["default"])
         
         # Display the editor form
         with st.form("equipment_editor_form", clear_on_submit=True):
@@ -432,6 +433,16 @@ def display_equipment_tab():
                 help="Floor area served by this equipment."
             )
             
+            # Equipment load
+            equipment_load = st.number_input(
+                "Equipment Load (W/m²)",
+                min_value=0.0,
+                max_value=200.0,
+                value=float(editor_state.get("equipment_load", default_equipment_data["equipment_load_w_m2"])),
+                format="%.2f",
+                help="Total equipment load in watts per square meter."
+            )
+            
             # Heat gains
             st.write("**Heat Gains (W/m²):**")
             col_sens, col_lat = st.columns(2)
@@ -441,7 +452,7 @@ def display_equipment_tab():
                     "Sensible Heat Gain",
                     min_value=0.0,
                     max_value=200.0,
-                    value=float(editor_state.get("sensible_gain", default_equipment_data["sensible"])),
+                    value=float(editor_state.get("sensible_gain", default_equipment_data["equipment_load_w_m2"] * (default_equipment_data["sensible_percent"] / 100))),
                     format="%.2f",
                     help="Sensible heat gain in watts per square meter."
                 )
@@ -451,7 +462,7 @@ def display_equipment_tab():
                     "Latent Heat Gain",
                     min_value=0.0,
                     max_value=200.0,
-                    value=float(editor_state.get("latent_gain", default_equipment_data["latent"])),
+                    value=float(editor_state.get("latent_gain", default_equipment_data["equipment_load_w_m2"] * (default_equipment_data["latent_percent"] / 100))),
                     format="%.2f",
                     help="Latent heat gain in watts per square meter."
                 )
@@ -465,7 +476,7 @@ def display_equipment_tab():
                     "Radiative Fraction",
                     min_value=0.0,
                     max_value=1.0,
-                    value=float(editor_state.get("radiative_fraction", 0.5)),
+                    value=float(editor_state.get("radiative_fraction", default_equipment_data["radiant_percent"] / 100)),
                     format="%.2f",
                     help="Fraction of sensible heat released as radiation."
                 )
@@ -475,7 +486,7 @@ def display_equipment_tab():
                     "Convective Fraction",
                     min_value=0.0,
                     max_value=1.0,
-                    value=float(editor_state.get("convective_fraction", 0.5)),
+                    value=float(editor_state.get("convective_fraction", default_equipment_data["convective_percent"] / 100)),
                     format="%.2f",
                     help="Fraction of sensible heat released as convection."
                 )
@@ -485,7 +496,7 @@ def display_equipment_tab():
             schedule = st.selectbox(
                 "Schedule",
                 available_schedules,
-                index=available_schedules.index(editor_state.get("schedule", available_schedules[0])) if editor_state.get("schedule") in available_schedules else 0,
+                index=available_schedules.index(editor_state.get("schedule", schedule_type)) if editor_state.get("schedule") in available_schedules else available_schedules.index(schedule_type) if schedule_type in available_schedules else 0,
                 help="Select the equipment schedule."
             )
             
@@ -507,6 +518,9 @@ def display_equipment_tab():
             if abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
                 st.error("Radiative and convective fractions must sum to 1.0")
                 return
+            if abs(sensible_gain + latent_gain - equipment_load) > 0.01:
+                st.error("Sensible and latent heat gains must sum to the equipment load.")
+                return
             # Check for unique name
             existing_names = [system["name"] for system in equipment_systems if not (is_edit and system["name"] == editor_state.get("name"))]
             if name.strip() in existing_names:
@@ -518,6 +532,7 @@ def display_equipment_tab():
                 "id": str(uuid.uuid4()),
                 "name": name.strip(),
                 "area": area,
+                "equipment_load": equipment_load,
                 "sensible_gain": sensible_gain,
                 "latent_gain": latent_gain,
                 "total_sensible_power": area * sensible_gain,