Update app/main.py

app/main.py

@@ -179,7 +179,9 @@ class HVACCalculator:
                 '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')
+                'latitude': climate_data.get('latitude', '40N'),
+                'wind_speed': climate_data.get('wind_speed', 4.0),
+                'day_of_year': climate_data.get('day_of_year', 204)
             }
             indoor_conditions = {
                 'temperature': building_info.get('indoor_temp', 24.0),
@@ -191,7 +193,7 @@ class HVACCalculator:
                 '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"
+                    'operating_hours': f"{internal_loads.get('people', [{}])[0].get('hours_in_operation', 8)}:00-{internal_loads.get('people', [{}])[0].get('hours_in_operation', 8)+10}:00"
                 },
                 'lights': {
                     'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
@@ -205,8 +207,15 @@ class HVACCalculator:
                     '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)}
+                'infiltration': {
+                    'flow_rate': building_info.get('infiltration_rate', 0.05),
+                    'height': building_info.get('building_height', 3.0),
+                    'crack_length': building_info.get('crack_length', 10.0)
+                },
+                'ventilation': {
+                    'flow_rate': building_info.get('ventilation_rate', 0.1)
+                },
+                'operating_hours': building_info.get('operating_hours', '8:00-18:00')
             }
             
             # Calculate hourly loads
@@ -214,7 +223,8 @@ class HVACCalculator:
                 building_components=building_components,
                 outdoor_conditions=outdoor_conditions,
                 indoor_conditions=indoor_conditions,
-                internal_loads=formatted_internal_loads
+                internal_loads=formatted_internal_loads,
+                building_volume=building_info.get('floor_area', 100.0) * building_info.get('building_height', 3.0)
             )
             
             # Get design loads
@@ -324,18 +334,22 @@ class HVACCalculator:
                     indoor_temp=indoor_conditions['temperature'],
                     month=outdoor_conditions['month'],
                     hour=design_loads['design_hour'],
-                    latitude=f"{outdoor_conditions['latitude']}_{outdoor_conditions['month'].upper()}"
+                    latitude=outdoor_conditions['latitude'],  # Fixed latitude format
+                    shading_coefficient=window.shading_coefficient
                 )
+                scl_latitude = f"{float(outdoor_conditions['latitude'][:-1])}_{outdoor_conditions['month'].upper()}"  # Adjusted for ASHRAE SCL tables
                 results['detailed_loads']['windows'].append({
                     'name': window.name,
                     'orientation': window.orientation.value,
                     'area': window.area,
                     'u_value': window.u_value,
                     'shgc': window.shgc,
+                    'shading_device': window.shading_device,
+                    'shading_coefficient': window.shading_coefficient,
                     'scl': self.cooling_calculator.ashrae_tables.get_scl(
                         window.orientation.value,
                         design_loads['design_hour'],
-                        f"{outdoor_conditions['latitude']}_{outdoor_conditions['month'].upper()}"
+                        scl_latitude
                     ),
                     'load': load_dict['total'] / 1000
                 })
@@ -361,7 +375,6 @@ class HVACCalculator:
                         load_dict = self.cooling_calculator.calculate_people_cooling_load(
                             num_people=load['num_people'],
                             activity_level=load['activity_level'],
-                            hours_occupancy=f"{load['hours_in_operation']}h",
                             hour=design_loads['design_hour']
                         )
                     elif load_type == 'lighting':
@@ -369,7 +382,6 @@ class HVACCalculator:
                             power=load['power'],
                             use_factor=load['usage_factor'],
                             special_allowance=0.1,
-                            hours_operation=f"{load['hours_in_operation']}h",
                             hour=design_loads['design_hour']
                         )}
                     else:
@@ -377,7 +389,6 @@ class HVACCalculator:
                             power=load['power'],
                             use_factor=load['usage_factor'],
                             radiation_factor=load['radiation_fraction'],
-                            hours_operation=f"{load['hours_in_operation']}h",
                             hour=design_loads['design_hour']
                         )
                     results['detailed_loads']['internal'].append({
@@ -444,21 +455,39 @@ class HVACCalculator:
             formatted_internal_loads = {
                 'people': {
                     'number': sum(load['num_people'] for load in internal_loads.get('people', [])),
-                    'sensible_gain': 70
+                    'sensible_gain': 70,
+                    'operating_hours': f"{internal_loads.get('people', [{}])[0].get('hours_in_operation', 8)}:00-{internal_loads.get('people', [{}])[0].get('hours_in_operation', 8)+10}:00"
                 },
                 'lights': {
                     'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
-                    'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8)
+                    'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8),
+                    '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)
+                    'use_factor': internal_loads.get('equipment', [{}])[0].get('usage_factor', 0.7),
+                    'hours_operation': f"{internal_loads.get('equipment', [{}])[0].get('hours_in_operation', 8)}h"
+                },
+                'infiltration': {
+                    'flow_rate': building_info.get('infiltration_rate', 0.05),
+                    'height': building_info.get('building_height', 3.0),
+                    'crack_length': building_info.get('crack_length', 10.0)
                 },
-                'infiltration': {'flow_rate': building_info.get('infiltration_rate', 0.05)},
-                'ventilation': {'flow_rate': building_info.get('ventilation_rate', 0.1)},
-                'usage_factor': 0.7
+                'ventilation': {
+                    'flow_rate': building_info.get('ventilation_rate', 0.1)
+                },
+                'usage_factor': 0.7,
+                'operating_hours': building_info.get('operating_hours', '8:00-18:00')
             }
             
+            # Debug: Log inputs to verify
+            st.write("Debug: Heating Inputs", {
+                'building_components': {k: len(v) for k, v in building_components.items()},
+                'outdoor_conditions': outdoor_conditions,
+                'indoor_conditions': indoor_conditions,
+                'internal_loads': formatted_internal_loads
+            })
+            
             # Calculate design loads
             design_loads = self.heating_calculator.calculate_design_heating_load(
                 building_components=building_components,
@@ -584,6 +613,7 @@ class HVACCalculator:
             
             return True, "Heating calculation completed.", results
         except Exception as e:
+            st.error(f"Heating calculation error: {str(e)}")
             return False, f"Heating calculation error: {str(e)}", {}
     
     def display_calculation_results(self):
@@ -605,7 +635,7 @@ class HVACCalculator:
             
             if debug:
                 st.write("Cooling Inputs:", {
-                    'components': st.session_state.get('components', {}),
+                    'components': {k: len(v) for k, v in st.session_state.get('components', {}).items()},
                     'internal_loads': st.session_state.get('internal_loads', {}),
                     'climate_data': st.session_state.get('climate_data', {}),
                     'building_info': st.session_state.get('building_info', {})
@@ -629,7 +659,7 @@ class HVACCalculator:
             
             if debug:
                 st.write("Heating Inputs:", {
-                    'components': st.session_state.get('components', {}),
+                    'components': {k: len(v) for k, v in st.session_state.get('components', {}).items()},
                     'internal_loads': st.session_state.get('internal_loads', {}),
                     'climate_data': st.session_state.get('climate_data', {}),
                     'building_info': st.session_state.get('building_info', {})