mabuseif commited on
Commit
df06cf0
verified
1 Parent(s): 72a2552

Update app/internal_loads.py

Browse files
Files changed (1) hide show
  1. app/internal_loads.py +16 -16
app/internal_loads.py CHANGED
@@ -597,6 +597,7 @@ def display_ventilation_tab():
597
  # Get building type for default values
598
  building_type = st.session_state.project_data["building_info"].get("building_type")
599
  default_building_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])
 
600
 
601
  # System type selection (outside form)
602
  system_type = st.selectbox(
@@ -640,12 +641,12 @@ def display_ventilation_tab():
640
  # Type-specific inputs
641
  if system_type == "AirChanges/Hour":
642
  design_flow_rate = st.number_input(
643
- "Design Flow Rate (ACH)",
644
  min_value=0.1,
645
  max_value=50.0,
646
- value=float(editor_state.get("design_flow_rate", default_building_data.get("ventilation_rate", 1.0))),
647
  format="%.2f",
648
- help="Air change rate in air changes per hour."
649
  )
650
  ventilation_type = st.selectbox(
651
  "Ventilation Type",
@@ -691,12 +692,12 @@ def display_ventilation_tab():
691
  latent_effectiveness = 0.0
692
  elif system_type == "Balanced Flow":
693
  design_flow_rate = st.number_input(
694
- "Design Flow Rate (m鲁/s)",
695
  min_value=0.0,
696
- max_value=100.0,
697
- value=float(editor_state.get("design_flow_rate", 0.5)),
698
  format="%.2f",
699
- help="Balanced supply and exhaust flow rate in cubic meters per second."
700
  )
701
  fan_pressure_rise = st.number_input(
702
  "Fan Pressure Rise (Pa)",
@@ -724,12 +725,12 @@ def display_ventilation_tab():
724
  latent_effectiveness = 0.0
725
  elif system_type == "Heat Recovery":
726
  design_flow_rate = st.number_input(
727
- "Design Flow Rate (m鲁/s)",
728
  min_value=0.0,
729
- max_value=100.0,
730
- value=float(editor_state.get("design_flow_rate", 0.5)),
731
  format="%.2f",
732
- help="Balanced supply and exhaust flow rate in cubic meters per second."
733
  )
734
  fan_pressure_rise = st.number_input(
735
  "Fan Pressure Rise (Pa)",
@@ -858,6 +859,7 @@ def display_infiltration_tab():
858
  # Get building type for default values
859
  building_type = st.session_state.project_data["building_info"].get("building_type")
860
  default_building_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])
 
861
 
862
  # System type selection (outside form)
863
  system_type = st.selectbox(
@@ -904,7 +906,7 @@ def display_infiltration_tab():
904
  "Design Flow Rate (ACH)",
905
  min_value=0.0,
906
  max_value=10.0,
907
- value=float(editor_state.get("design_flow_rate", default_building_data.get("air_change_rate", 0.3))),
908
  format="%.2f",
909
  help="Air change rate in air changes per hour."
910
  )
@@ -1427,10 +1429,8 @@ def display_ventilation_table(ventilation_systems: List[Dict[str, Any]]):
1427
  cols[0].write(system["name"])
1428
  cols[1].write(system.get("system_type", "Unknown"))
1429
  cols[2].write(f"{system.get('area', 0):.1f}")
1430
- if system.get("system_type") == "AirChanges/Hour":
1431
- rate_info = f"{system.get('design_flow_rate', 0):.2f} ACH"
1432
- elif system.get("system_type") in ["Balanced Flow", "Heat Recovery"]:
1433
- rate_info = f"{system.get('design_flow_rate', 0):.2f} m鲁/s"
1434
  else:
1435
  rate_info = f"{system.get('opening_effectiveness', 0):.2f} %"
1436
  cols[3].write(rate_info)
 
597
  # Get building type for default values
598
  building_type = st.session_state.project_data["building_info"].get("building_type")
599
  default_building_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])
600
+ default_ventilation_rate = default_building_data.get("ventilation_rate", 1.0) # L/s路m虏
601
 
602
  # System type selection (outside form)
603
  system_type = st.selectbox(
 
641
  # Type-specific inputs
642
  if system_type == "AirChanges/Hour":
643
  design_flow_rate = st.number_input(
644
+ "Design Flow Rate (L/s路m虏)",
645
  min_value=0.1,
646
  max_value=50.0,
647
+ value=float(editor_state.get("design_flow_rate", default_ventilation_rate)),
648
  format="%.2f",
649
+ help="Ventilation rate in liters per second per square meter."
650
  )
651
  ventilation_type = st.selectbox(
652
  "Ventilation Type",
 
692
  latent_effectiveness = 0.0
693
  elif system_type == "Balanced Flow":
694
  design_flow_rate = st.number_input(
695
+ "Design Flow Rate (L/s路m)",
696
  min_value=0.0,
697
+ max_value=50.0,
698
+ value=float(editor_state.get("design_flow_rate", default_ventilation_rate)),
699
  format="%.2f",
700
+ help="Balanced supply and exhaust flow rate in liters per second per square meter."
701
  )
702
  fan_pressure_rise = st.number_input(
703
  "Fan Pressure Rise (Pa)",
 
725
  latent_effectiveness = 0.0
726
  elif system_type == "Heat Recovery":
727
  design_flow_rate = st.number_input(
728
+ "Design Flow Rate (L/s路m)",
729
  min_value=0.0,
730
+ max_value=50.0,
731
+ value=float(editor_state.get("design_flow_rate", default_ventilation_rate)),
732
  format="%.2f",
733
+ help="Balanced supply and exhaust flow rate in liters per second per square meter."
734
  )
735
  fan_pressure_rise = st.number_input(
736
  "Fan Pressure Rise (Pa)",
 
859
  # Get building type for default values
860
  building_type = st.session_state.project_data["building_info"].get("building_type")
861
  default_building_data = DEFAULT_BUILDING_INTERNALS.get(building_type, DEFAULT_BUILDING_INTERNALS["Other"])
862
+ default_air_change_rate = default_building_data.get("air_change_rate", 0.3) # ACH
863
 
864
  # System type selection (outside form)
865
  system_type = st.selectbox(
 
906
  "Design Flow Rate (ACH)",
907
  min_value=0.0,
908
  max_value=10.0,
909
+ value=float(editor_state.get("design_flow_rate", default_air_change_rate)),
910
  format="%.2f",
911
  help="Air change rate in air changes per hour."
912
  )
 
1429
  cols[0].write(system["name"])
1430
  cols[1].write(system.get("system_type", "Unknown"))
1431
  cols[2].write(f"{system.get('area', 0):.1f}")
1432
+ if system.get("system_type") in ["AirChanges/Hour", "Balanced Flow", "Heat Recovery"]:
1433
+ rate_info = f"{system.get('design_flow_rate', 0):.2f} L/s路m虏"
 
 
1434
  else:
1435
  rate_info = f"{system.get('opening_effectiveness', 0):.2f} %"
1436
  cols[3].write(rate_info)