Update app/main.py

app/main.py

@@ -25,8 +25,8 @@ from data.reference_data import ReferenceData
 from data.climate_data import ClimateData
 from data.ashrae_tables import ASHRAETables
 from data.building_components import Wall as WallModel, Roof as RoofModel
-from utils.cooling_load import CoolingLoadCalculator
-from utils.heating_load import HeatingLoadCalculator
+from data.cooling_load_updated import CoolingLoadCalculator
+from data.heating_load_updated import HeatingLoadCalculator
 
 # Import utility modules
 from utils.u_value_calculator import UValueCalculator
@@ -169,50 +169,31 @@ class HVACCalculator:
                     'summer_outdoor_rh': 50.0,
                     'ground_temperature': 20.0,
                     'design_month': 'Jul',
-                    'latitude': '40N'
+                    'latitude': '40N',
+                    'daily_range_c': 11.0
                 }
                 st.warning("No climate data provided. Using default values.")
             
-            # Default conditions
-            outdoor_conditions = {
-                'temperature': climate_data.get('summer_outdoor_db', 35.0),
-                'relative_humidity': climate_data.get('summer_outdoor_rh', 50.0),
-                'ground_temperature': climate_data.get('ground_temperature', 20.0),
-                'month': climate_data.get('design_month', 'Jul'),
-                'latitude': climate_data.get('latitude', '40N'),
+            # Format climate data for calculator
+            climate_conditions = {
+                'outdoor_temp_c': climate_data.get('summer_outdoor_db', 35.0),
+                'indoor_temp_c': building_info.get('indoor_temp', 24.0),
+                'latitude': float(climate_data.get('latitude', '40N').replace('N', '')),
                 'daily_range_c': climate_data.get('daily_range_c', 11.0)
             }
-            indoor_conditions = {
-                'temperature': building_info.get('indoor_temp', 24.0),
-                'relative_humidity': building_info.get('indoor_rh', 50.0)
-            }
             
-            # Format internal loads for CoolingLoadCalculator
+            # Format internal loads (simplified for cooling_load_updated.py)
             formatted_internal_loads = {
-                'people': {
-                    'number': sum(load['num_people'] for load in internal_loads.get('people', [])),
-                    'activity_level': internal_loads.get('people', [{}])[0].get('activity_level', 'Seated/Resting'),
-                    'hours_occupancy': f"{internal_loads.get('people', [{}])[0].get('hours_in_operation', 8)}h"
-                },
-                'lights': {
-                    'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
-                    'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8),
-                    'special_allowance': 0.1,
-                    'hours_operation': f"{internal_loads.get('lighting', [{}])[0].get('hours_in_operation', 8)}h"
-                },
-                'equipment': {
-                    'power': sum(load['power'] for load in internal_loads.get('equipment', [])),
-                    'use_factor': internal_loads.get('equipment', [{}])[0].get('usage_factor', 0.7),
-                    'radiation_factor': internal_loads.get('equipment', [{}])[0].get('radiation_fraction', 0.3),
-                    'hours_operation': f"{internal_loads.get('equipment', [{}])[0].get('hours_in_operation', 8)}h"
-                },
-                'infiltration': {'flow_rate': building_info.get('infiltration_rate', 0.05)},
-                'ventilation': {'flow_rate': building_info.get('ventilation_rate', 0.1)}
+                'people': sum(load['num_people'] for load in internal_loads.get('people', [])) * 100,  # W/person
+                'lighting': sum(load['power'] * load['usage_factor'] for load in internal_loads.get('lighting', [])),  # W
+                'equipment': sum(load['power'] * load['usage_factor'] for load in internal_loads.get('equipment', [])),  # W
+                'infiltration': building_info.get('infiltration_rate', 0.05) * building_info.get('floor_area', 100.0),  # m³/s
+                'ventilation': building_info.get('ventilation_rate', 0.1) * building_info.get('floor_area', 100.0)  # m³/s
             }
             
-            # Initialize calculator with building_info, components, and climate_data
-            calculator = CoolingLoadCalculator(building_info, building_components, outdoor_conditions)
-            cooling_loads = calculator.calculate_cooling_load()
+            # Initialize calculator and calculate
+            calculator = CoolingLoadCalculator()
+            cooling_loads = calculator.calculate_cooling_load(building_info, building_components, climate_conditions, formatted_internal_loads)
             
             # Format results for results_display.py
             floor_area = building_info.get('floor_area', 100.0) or 100.0
@@ -261,39 +242,25 @@ class HVACCalculator:
                 }
                 st.warning("No climate data provided. Using default values.")
             
-            # Default conditions
-            outdoor_conditions = {
-                'design_temperature': climate_data.get('winter_outdoor_db', -10.0),
-                'design_relative_humidity': climate_data.get('winter_outdoor_rh', 80.0),
-                'ground_temperature': climate_data.get('ground_temperature', 10.0)
-            }
-            indoor_conditions = {
-                'temperature': building_info.get('indoor_temp', 21.0),
-                'relative_humidity': building_info.get('indoor_rh', 40.0)
+            # Format climate data
+            climate_conditions = {
+                'outdoor_temp_c': climate_data.get('winter_outdoor_db', -10.0),
+                'indoor_temp_c': building_info.get('indoor_temp', 21.0),
+                'ground_temperature_c': climate_data.get('ground_temperature', 10.0)
             }
             
             # Format internal loads
             formatted_internal_loads = {
-                'people': {
-                    'number': sum(load['num_people'] for load in internal_loads.get('people', [])),
-                    'sensible_gain': 70
-                },
-                'lights': {
-                    'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
-                    'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8)
-                },
-                'equipment': {
-                    'power': sum(load['power'] for load in internal_loads.get('equipment', [])),
-                    'use_factor': internal_loads.get('equipment', [{}])[0].get('usage_factor', 0.7)
-                },
-                'infiltration': {'flow_rate': building_info.get('infiltration_rate', 0.05)},
-                'ventilation': {'flow_rate': building_info.get('ventilation_rate', 0.1)},
-                'usage_factor': 0.7
+                'people': sum(load['num_people'] for load in internal_loads.get('people', [])) * 70,  # W/person
+                'lighting': sum(load['power'] * load['usage_factor'] for load in internal_loads.get('lighting', [])),  # W
+                'equipment': sum(load['power'] * load['usage_factor'] for load in internal_loads.get('equipment', [])),  # W
+                'infiltration': building_info.get('infiltration_rate', 0.05) * building_info.get('floor_area', 100.0),  # m³/s
+                'ventilation': building_info.get('ventilation_rate', 0.1) * building_info.get('floor_area', 100.0)  # m³/s
             }
             
-            # Initialize calculator
-            calculator = HeatingLoadCalculator(building_info, building_components, outdoor_conditions)
-            heating_loads = calculator.calculate_heating_load()
+            # Initialize calculator and calculate
+            calculator = HeatingLoadCalculator()
+            heating_loads = calculator.calculate_heating_load(building_info, building_components, climate_conditions, formatted_internal_loads)
             
             # Format results
             floor_area = building_info.get('floor_area', 100.0) or 100.0
@@ -419,7 +386,7 @@ class HVACCalculator:
     def display_people_loads(self):
         st.subheader("People")
         
-        with st.form("people_load_form"):
+        with st.form("people_load_form", clear_on_submit=True):
             col1, col2 = st.columns(2)
             
             with col1:
@@ -452,7 +419,6 @@ class HVACCalculator:
                 
                 st.session_state.internal_loads['people'].append(people_load)
                 st.success(f"Added {name} with {num_people} people")
-                st.rerun()
         
         if st.session_state.internal_loads['people']:
             st.subheader("Existing People Loads")
@@ -497,7 +463,7 @@ class HVACCalculator:
     def display_lighting_loads(self):
         st.subheader("Lighting")
         
-        with st.form("lighting_load_form"):
+        with st.form("lighting_load_form", clear_on_submit=True):
             col1, col2 = st.columns(2)
             
             with col1:
@@ -527,7 +493,6 @@ class HVACCalculator:
                 
                 st.session_state.internal_loads['lighting'].append(lighting_load)
                 st.success(f"Added {name} with {power} W")
-                st.rerun()
         
         if st.session_state.internal_loads['lighting']:
             st.subheader("Existing Lighting Loads")
@@ -572,7 +537,7 @@ class HVACCalculator:
     def display_equipment_loads(self):
         st.subheader("Equipment")
         
-        with st.form("equipment_load_form"):
+        with st.form("equipment_load_form", clear_on_submit=True):
             col1, col2 = st.columns(2)
             
             with col1:
@@ -605,7 +570,6 @@ class HVACCalculator:
                 
                 st.session_state.internal_loads['equipment'].append(equipment_load)
                 st.success(f"Added {name} with {power} W")
-                st.rerun()
         
         if st.session_state.internal_loads['equipment']:
             st.subheader("Existing Equipment Loads")