Update app/hvac_loads.py

app/hvac_loads.py

@@ -1172,25 +1172,21 @@ def display_hvac_loads_page():
         lighting_systems = internal_loads.get("lighting", [])
         equipment_systems = internal_loads.get("equipment", [])
         
-        # Calculate average fractions from lighting systems
-        lighting_convective_total = 0.0
-        lighting_radiative_total = 0.0
-        lighting_count = len(lighting_systems) or 1  # Avoid division by zero
-        for system in lighting_systems:
-            lighting_convective_total += system.get("convective_fraction", 0.5)
-            lighting_radiative_total += system.get("radiative_fraction", 0.5)
-        default_lighting_convective = lighting_convective_total / lighting_count
-        default_lighting_radiative = lighting_radiative_total / lighting_count
+        # Calculate default lighting fractions from lighting systems
+        if lighting_systems:
+            lighting_convective_avg = sum(system.get("convective_fraction", 0.5) for system in lighting_systems) / len(lighting_systems)
+            lighting_radiative_avg = sum(system.get("radiative_fraction", 0.5) for system in lighting_systems) / len(lighting_systems)
+        else:
+            lighting_convective_avg = st.session_state.project_data["internal_loads_conditions"].get("lighting_convective_fraction", 0.5)
+            lighting_radiative_avg = st.session_state.project_data["internal_loads_conditions"].get("lighting_radiative_fraction", 0.5)
         
-        # Calculate average fractions from equipment systems
-        equipment_convective_total = 0.0
-        equipment_radiative_total = 0.0
-        equipment_count = len(equipment_systems) or 1  # Avoid division by zero
-        for system in equipment_systems:
-            equipment_convective_total += system.get("convective_fraction", 0.5)
-            equipment_radiative_total += system.get("radiative_fraction", 0.5)
-        default_equipment_convective = equipment_convective_total / equipment_count
-        default_equipment_radiative = equipment_radiative_total / equipment_count
+        # Calculate default equipment fractions from equipment systems
+        if equipment_systems:
+            equipment_convective_avg = sum(system.get("convective_fraction", 0.5) for system in equipment_systems) / len(equipment_systems)
+            equipment_radiative_avg = sum(system.get("radiative_fraction", 0.5) for system in equipment_systems) / len(equipment_systems)
+        else:
+            equipment_convective_avg = st.session_state.project_data["internal_loads_conditions"].get("equipment_convective_fraction", 0.5)
+            equipment_radiative_avg = st.session_state.project_data["internal_loads_conditions"].get("equipment_radiative_fraction", 0.5)
         
         with col1:
             air_velocity = st.number_input(
@@ -1210,7 +1206,7 @@ def display_hvac_loads_page():
                 "Lighting Convective Fraction",
                 min_value=0.0,
                 max_value=1.0,
-                value=st.session_state.project_data["internal_loads_conditions"].get("lighting_convective_fraction", default_lighting_convective),
+                value=lighting_convective_avg,
                 step=0.01,
                 key="hvac_lighting_convective"
             )
@@ -1220,20 +1216,22 @@ def display_hvac_loads_page():
                 "Lighting Radiative Fraction",
                 min_value=0.0,
                 max_value=1.0,
-                value=st.session_state.project_data["internal_loads_conditions"].get("lighting_radiative_fraction", default_lighting_radiative),
+                value=lighting_radiative_avg,
                 step=0.01,
                 key="hvac_lighting_radiative"
             )
             # Validate lighting fractions sum to 1.0
             if abs(lighting_convective_fraction + lighting_radiative_fraction - 1.0) > 0.01:
                 st.error("Lighting convective and radiative fractions must sum to 1.0.")
+                lighting_radiative_fraction = 1.0 - lighting_convective_fraction  # Auto-correct radiative fraction
+                st.warning(f"Adjusted Lighting Radiative Fraction to {lighting_radiative_fraction:.2f} to ensure sum equals 1.0.")
         
         with col4:
             equipment_convective_fraction = st.number_input(
                 "Equipment Convective Fraction",
                 min_value=0.0,
                 max_value=1.0,
-                value=st.session_state.project_data["internal_loads_conditions"].get("equipment_convective_fraction", default_equipment_convective),
+                value=equipment_convective_avg,
                 step=0.01,
                 key="hvac_equipment_convective"
             )
@@ -1243,15 +1241,18 @@ def display_hvac_loads_page():
                 "Equipment Radiative Fraction",
                 min_value=0.0,
                 max_value=1.0,
-                value=st.session_state.project_data["internal_loads_conditions"].get("equipment_radiative_fraction", default_equipment_radiative),
+                value=equipment_radiative_avg,
                 step=0.01,
                 key="hvac_equipment_radiative"
             )
             # Validate equipment fractions sum to 1.0
             if abs(equipment_convective_fraction + equipment_radiative_fraction - 1.0) > 0.01:
                 st.error("Equipment convective and radiative fractions must sum to 1.0.")
+                equipment_radiative_fraction = 1.0 - equipment_convective_fraction  # Auto-correct radiative fraction
+                st.warning(f"Adjusted Equipment Radiative Fraction to {equipment_radiative_fraction:.2f} to ensure sum equals 1.0.")
         
         if st.button("Save Internal Loads Conditions"):
+            # Update internal loads conditions in session state
             st.session_state.project_data["internal_loads_conditions"].update({
                 "air_velocity": air_velocity,
                 "lighting_convective_fraction": lighting_convective_fraction,
@@ -1268,7 +1269,7 @@ def display_hvac_loads_page():
                 system["convective_fraction"] = equipment_convective_fraction
                 system["radiative_fraction"] = equipment_radiative_fraction
             st.success("Internal loads conditions saved successfully.")
-            logger.info("Internal loads conditions updated in session state")
+            logger.info("Internal loads conditions updated in session state.")
 
         # Calculate HVAC Loads
         if st.button("Calculate HVAC Loads"):