Update app/internal_loads.py

app/internal_loads.py

@@ -308,29 +308,13 @@ def display_lighting_tab():
                 help="Lighting power density in watts per square meter."
             )
             
-            # Heat fractions
-            st.write("**Heat Distribution:**")
-            col_rad, col_conv = st.columns(2)
-            
-            with col_rad:
-                radiative_fraction = st.number_input(
-                    "Radiative Fraction",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state.get("radiative_fraction", 0.4)),
-                    format="%.2f",
-                    help="Fraction of heat released as radiation."
-                )
-            
-            with col_conv:
-                convective_fraction = st.number_input(
-                    "Convective Fraction",
-                    min_value=0.0,
-                    max_value=1.0,
-                    value=float(editor_state.get("convective_fraction", 0.6)),
-                    format="%.2f",
-                    help="Fraction of heat released as convection."
-                )
+            # Lighting type
+            lighting_type = st.selectbox(
+                "Lighting Type",
+                list(LIGHTING_FIXTURE_TYPES.keys()),
+                index=list(LIGHTING_FIXTURE_TYPES.keys()).index(editor_state.get("lighting_type", list(LIGHTING_FIXTURE_TYPES.keys())[0])) if editor_state.get("lighting_type") in LIGHTING_FIXTURE_TYPES else 0,
+                help="Select the type of lighting fixture."
+            )
             
             # Schedule selection
             available_schedules = list(st.session_state.project_data["internal_loads"]["schedules"].keys())
@@ -356,15 +340,15 @@ def display_lighting_tab():
             if not name.strip():
                 st.error("System name is required.")
                 return
-            if abs(radiative_fraction + convective_fraction - 1.0) > 0.01:
-                st.error("Radiative and convective fractions must sum to 1.0")
-                return
             # Check for unique name
             existing_names = [system["name"] for system in lighting_systems if not (is_edit and system["name"] == editor_state.get("name"))]
             if name.strip() in existing_names:
                 st.error("System name must be unique.")
                 return
             
+            # Get lighting fixture data
+            fixture_data = LIGHTING_FIXTURE_TYPES[lighting_type]
+            
             # Create lighting system data
             lighting_data = {
                 "id": str(uuid.uuid4()),
@@ -372,8 +356,9 @@ def display_lighting_tab():
                 "area": area,
                 "lpd": lpd,
                 "total_power": area * lpd,
-                "radiative_fraction": radiative_fraction,
-                "convective_fraction": convective_fraction,
+                "lighting_type": lighting_type,
+                "radiative_fraction": fixture_data["radiative"] / 100.0,
+                "convective_fraction": fixture_data["convective"] / 100.0,
                 "schedule": schedule
             }
             
@@ -1016,8 +1001,7 @@ def display_lighting_table(lighting_systems: List[Dict[str, Any]]):
                     "name": system.get("name", ""),
                     "area": system.get("area", 100.0),
                     "lpd": system.get("lpd", 12.0),
-                    "radiative_fraction": system.get("radiative_fraction", 0.4),
-                    "convective_fraction": system.get("convective_fraction", 0.6),
+                    "lighting_type": system.get("lighting_type", list(LIGHTING_FIXTURE_TYPES.keys())[0]),
                     "schedule": system.get("schedule", "Continuous"),
                     "is_edit": True
                 }