Update app/main.py

app/main.py

@@ -3,6 +3,7 @@ HVAC Calculator Code Documentation.
 Updated 2025-05-02: Integrated skylights, surface color, glazing type, frame type, and drapery adjustments from main_new.py.
 Updated 2025-05-02: Enhanced per Plan.txt to include winter design temperature, humidity, building height, ventilation rate, internal load enhancements, and calculation parameters.
 Updated 2025-05-09: Fixed latitude parsing to return string (e.g., "24N") to match ASHRAE table keys and added group validation.
+Updated 2025-05-09: Corrected group validation to use alphabetical groups (A, B, C, ...) and enhanced stale component handling.
 """
 
 import streamlit as st
@@ -53,8 +54,8 @@ VENTILATION_RATES = {
     "Custom": {"people_rate": 0.0, "area_rate": 0.0}
 }
 
-# Valid wall and roof groups for ASHRAE CLTD tables (adjust based on ashrae_tables.py)
-VALID_WALL_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
+# Valid wall and roof groups for ASHRAE CLTD tables (alphabetical, based on ASHRAE tables)
+VALID_WALL_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J']
 VALID_ROOF_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
 
 class HVACCalculator:
@@ -205,6 +206,18 @@ class HVACCalculator:
         if not self.climate_data.validate_climate_data(climate_data):
             return False, "Invalid climate data format or values."
         
+        # Fix stale components with invalid groups
+        for component_type in ['walls', 'roofs']:
+            for comp in components.get(component_type, []):
+                if component_type == 'walls':
+                    if getattr(comp, 'wall_group', '') not in VALID_WALL_GROUPS:
+                        st.warning(f"Invalid wall group '{comp.wall_group}' for {comp.name}. Setting to 'A'.")
+                        comp.wall_group = 'A'
+                if component_type == 'roofs':
+                    if getattr(comp, 'roof_group', '') not in VALID_ROOF_GROUPS:
+                        st.warning(f"Invalid roof group '{comp.roof_group}' for {comp.name}. Setting to 'A'.")
+                        comp.roof_group = 'A'
+        
         # Validate components
         for component_type in ['walls', 'roofs', 'windows', 'doors', 'floors', 'skylights']:
             for comp in components.get(component_type, []):
@@ -303,11 +316,10 @@ class HVACCalculator:
                 raise ValueError("Invalid latitude format")
             
             # Convert to ASHRAE table format (e.g., '24N', '32N')
-            if lat_value in [24, 32, 40, 48]:  # Common ASHRAE latitudes
+            supported_latitudes = [24, 32, 40, 48]
+            if lat_value in supported_latitudes:
                 return f"{int(lat_value)}N"
             else:
-                # Round to nearest supported latitude
-                supported_latitudes = [24, 32, 40, 48]
                 closest_lat = min(supported_latitudes, key=lambda x: abs(x - lat_value))
                 st.warning(f"Latitude {lat_value} not in ASHRAE tables. Using closest: {closest_lat}N")
                 return f"{closest_lat}N"
@@ -792,78 +804,86 @@ class HVACCalculator:
             
             # Populate detailed loads
             for wall in building_components.get('walls', []):
-                load = self.cooling_calculator.calculate_wall_cooling_load(
-                    wall=wall,
-                    outdoor_temp=outdoor_conditions['temperature'],
-                    indoor_temp=indoor_conditions['temperature'],
-                    month=outdoor_conditions['month'],
-                    hour=design_loads['design_hour'],
-                    latitude=outdoor_conditions['latitude'],
-                    solar_absorptivity=wall.solar_absorptivity
-                )
-                if st.session_state.get('debug_mode', False):
-                    st.write("Debug: Wall CLTD Inputs", {
-                        'wall_name': wall.name,
-                        'element_type': 'wall',
-                        'group': wall.wall_group,
-                        'orientation': wall.orientation.value,
-                        'hour': design_loads['design_hour'],
-                        'latitude': self.parse_latitude(outdoor_conditions['latitude']),
-                        'solar_absorptivity': wall.solar_absorptivity
-                    })
-                results['detailed_loads']['walls'].append({
-                    'name': wall.name,
-                    'orientation': wall.orientation.value,
-                    'area': wall.area,
-                    'u_value': wall.u_value,
-                    'solar_absorptivity': wall.solar_absorptivity,
-                    'cltd': self.cooling_calculator.ashrae_tables.get_cltd(
-                        element_type='wall',
-                        group=wall.wall_group,
-                        orientation=wall.orientation.value,
+                try:
+                    load = self.cooling_calculator.calculate_wall_cooling_load(
+                        wall=wall,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature'],
+                        month=outdoor_conditions['month'],
                         hour=design_loads['design_hour'],
-                        latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                        latitude=outdoor_conditions['latitude'],
                         solar_absorptivity=wall.solar_absorptivity
-                    ),
-                    'load': load / 1000
-                })
+                    )
+                    if st.session_state.get('debug_mode', False):
+                        st.write("Debug: Wall CLTD Inputs", {
+                            'wall_name': wall.name,
+                            'element_type': 'wall',
+                            'group': wall.wall_group,
+                            'orientation': wall.orientation.value,
+                            'hour': design_loads['design_hour'],
+                            'latitude': self.parse_latitude(outdoor_conditions['latitude']),
+                            'solar_absorptivity': wall.solar_absorptivity
+                        })
+                    results['detailed_loads']['walls'].append({
+                        'name': wall.name,
+                        'orientation': wall.orientation.value,
+                        'area': wall.area,
+                        'u_value': wall.u_value,
+                        'solar_absorptivity': wall.solar_absorptivity,
+                        'cltd': self.cooling_calculator.ashrae_tables.get_cltd(
+                            element_type='wall',
+                            group=wall.wall_group,
+                            orientation=wall.orientation.value,
+                            hour=design_loads['design_hour'],
+                            latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                            solar_absorptivity=wall.solar_absorptivity
+                        ),
+                        'load': load / 1000
+                    })
+                except TypeError as te:
+                    st.error(f"Type error in wall CLTD calculation for {wall.name}: {str(te)}")
+                    return False, f"Type error in wall CLTD calculation: {str(te)}", {}
             
             for roof in building_components.get('roofs', []):
-                load = self.cooling_calculator.calculate_roof_cooling_load(
-                    roof=roof,
-                    outdoor_temp=outdoor_conditions['temperature'],
-                    indoor_temp=indoor_conditions['temperature'],
-                    month=outdoor_conditions['month'],
-                    hour=design_loads['design_hour'],
-                    latitude=outdoor_conditions['latitude'],
-                    solar_absorptivity=roof.solar_absorptivity
-                )
-                if st.session_state.get('debug_mode', False):
-                    st.write("Debug: Roof CLTD Inputs", {
-                        'roof_name': roof.name,
-                        'element_type': 'roof',
-                        'group': roof.roof_group,
-                        'orientation': roof.orientation.value,
-                        'hour': design_loads['design_hour'],
-                        'latitude': self.parse_latitude(outdoor_conditions['latitude']),
-                        'solar_absorptivity': roof.solar_absorptivity
-                    })
-                results['detailed_loads']['roofs'].append({
-                    'name': roof.name,
-                    'orientation': roof.orientation.value,
-                    'area': roof.area,
-                    'u_value': roof.u_value,
-                    'solar_absorptivity': roof.solar_absorptivity,
-                    'cltd': self.cooling_calculator.ashrae_tables.get_cltd(
-                        element_type='roof',
-                        group=roof.roof_group,
-                        orientation=roof.orientation.value,
+                try:
+                    load = self.cooling_calculator.calculate_roof_cooling_load(
+                        roof=roof,
+                        outdoor_temp=outdoor_conditions['temperature'],
+                        indoor_temp=indoor_conditions['temperature'],
+                        month=outdoor_conditions['month'],
                         hour=design_loads['design_hour'],
-                        latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                        latitude=outdoor_conditions['latitude'],
                         solar_absorptivity=roof.solar_absorptivity
-                    ),
-                    'load': load / 1000
-                })
+                    )
+                    if st.session_state.get('debug_mode', False):
+                        st.write("Debug: Roof CLTD Inputs", {
+                            'roof_name': roof.name,
+                            'element_type': 'roof',
+                            'group': roof.roof_group,
+                            'orientation': roof.orientation.value,
+                            'hour': design_loads['design_hour'],
+                            'latitude': self.parse_latitude(outdoor_conditions['latitude']),
+                            'solar_absorptivity': roof.solar_absorptivity
+                        })
+                    results['detailed_loads']['roofs'].append({
+                        'name': roof.name,
+                        'orientation': roof.orientation.value,
+                        'area': roof.area,
+                        'u_value': roof.u_value,
+                        'solar_absorptivity': roof.solar_absorptivity,
+                        'cltd': self.cooling_calculator.ashrae_tables.get_cltd(
+                            element_type='roof',
+                            group=roof.roof_group,
+                            orientation=roof.orientation.value,
+                            hour=design_loads['design_hour'],
+                            latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                            solar_absorptivity=roof.solar_absorptivity
+                        ),
+                        'load': load / 1000
+                    })
+                except TypeError as te:
+                    st.error(f"Type error in roof CLTD calculation for {roof.name}: {str(te)}")
+                    return False, f"Type error in roof CLTD calculation: {str(te)}", {}
             
             for window in building_components.get('windows', []):
                 adjusted_shgc = self.drapery.adjust_shgc(
@@ -1272,7 +1292,7 @@ class HVACCalculator:
                 results['detailed_loads']['floors'].append({
                     'name': floor.name,
                     'area': floor.area,
-                    'u_value': floor.area,  # CHANGED: Fixed typo (u_value was incorrectly set to area)
+                    'u_value': floor.u_value,  # FIXED: Corrected typo from previous version
                     'delta_t': indoor_conditions['temperature'] - outdoor_conditions['ground_temperature'],
                     'load': load / 1000
                 })