Update app/main.py

app/main.py

@@ -3,7 +3,8 @@ 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.
+Updated 2025-05-09: Corrected group validation to use alphabetical groups (A-H for walls, A-G for roofs) and enhanced stale component handling.
+Updated 2025-05-10: Aligned latitude parsing with cooling_load.py's validate_latitude and updated wall groups to A-H to match cooling_load.py.
 """
 
 import streamlit as st
@@ -54,8 +55,8 @@ VENTILATION_RATES = {
     "Custom": {"people_rate": 0.0, "area_rate": 0.0}
 }
 
-# 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 wall and roof groups for ASHRAE CLTD tables (aligned with cooling_load.py)
+VALID_WALL_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H']
 VALID_ROOF_GROUPS = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
 
 class HVACCalculator:
@@ -231,7 +232,7 @@ class HVACCalculator:
                         return False, f"Ground temperature for {comp.name} must be between -10°C and 40°C"
                     if getattr(comp, 'perimeter', 0) < 0:
                         return False, f"Perimeter for {comp.name} cannot be negative"
-                # NEW: Validate solar absorptivity for walls and roofs
+                # Validate solar absorptivity for walls and roofs
                 if component_type in ['walls', 'roofs']:
                     if not 0.1 <= getattr(comp, 'solar_absorptivity', 0.6) <= 1.0:
                         return False, f"Invalid solar absorptivity for {component_type}: {comp.name} (must be 0.1-1.0)"
@@ -243,7 +244,7 @@ class HVACCalculator:
                         return False, f"Glazing type missing for {component_type}: {comp.name}"
                     if getattr(comp, 'frame_type', None) is None:
                         return False, f"Frame type missing for {component_type}: {comp.name}"
-                # NEW: Validate wall and roof groups
+                # Validate wall and roof groups
                 if component_type == 'walls':
                     if getattr(comp, 'wall_group', '') not in VALID_WALL_GROUPS:
                         return False, f"Invalid wall group '{comp.wall_group}' for {comp.name}. Valid groups: {', '.join(VALID_WALL_GROUPS)}"
@@ -257,7 +258,7 @@ class HVACCalculator:
         if building_info.get('zone_type', '') == 'Custom' and building_info.get('ventilation_rate', 0) == 0:
             return False, "Custom ventilation rate must be specified"
         
-        # NEW: Validate new inputs from Plan.txt
+        # Validate new inputs from Plan.txt
         if not -50 <= building_info.get('winter_temp', -10) <= 20:
             return False, "Winter design temperature must be -50 to 20°C"
         if not 0 <= building_info.get('outdoor_rh', 50) <= 100:
@@ -307,26 +308,11 @@ class HVACCalculator:
     def parse_latitude(self, latitude: Any) -> str:
         """Parse latitude from string or number to ASHRAE table format (e.g., '24N')."""
         try:
-            if isinstance(latitude, (int, float)):
-                lat_value = float(latitude)
-            elif isinstance(latitude, str):
-                lat_str = latitude.strip().upper().replace('N', '').replace('S', '')
-                lat_value = float(lat_str)
-            else:
-                raise ValueError("Invalid latitude format")
-            
-            # Convert to ASHRAE table format (e.g., '24N', '32N')
-            supported_latitudes = [24, 32, 40, 48]
-            if lat_value in supported_latitudes:
-                return f"{int(lat_value)}N"
-            else:
-                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"
-                
-        except (ValueError, AttributeError) as e:
+            # Use cooling_calculator's validate_latitude for consistency
+            return self.cooling_calculator.validate_latitude(latitude)
+        except Exception as e:
             st.error(f"Invalid latitude: {latitude}. Using default 32N.")
-            return "32N"  # Default to 32N
+            return "32N"
     
     def display_internal_loads(self):
         st.title("Internal Loads")
@@ -664,13 +650,16 @@ class HVACCalculator:
                 "Jul": 196, "Aug": 227, "Sep": 258, "Oct": 288, "Nov": 319, "Dec": 350
             }
             
+            # Validate latitude using cooling_calculator
+            latitude = self.cooling_calculator.validate_latitude(location['latitude'])
+            
             # Format conditions
             outdoor_conditions = {
                 'temperature': location['summer_design_temp_db'],
                 'relative_humidity': building_info.get('outdoor_rh', location['monthly_humidity'].get('Jul', 50.0)),
                 'ground_temperature': location['monthly_temps'].get('Jul', 20.0),
                 'month': 'Jul',
-                'latitude': location['latitude'],
+                'latitude': latitude,
                 'wind_speed': building_info.get('wind_speed', 4.0),
                 'day_of_year': month_to_day.get('Jul', 182)
             }
@@ -821,7 +810,7 @@ class HVACCalculator:
                             'group': wall.wall_group,
                             'orientation': wall.orientation.value,
                             'hour': design_loads['design_hour'],
-                            'latitude': self.parse_latitude(outdoor_conditions['latitude']),
+                            'latitude': outdoor_conditions['latitude'],
                             'solar_absorptivity': wall.solar_absorptivity
                         })
                     results['detailed_loads']['walls'].append({
@@ -835,7 +824,7 @@ class HVACCalculator:
                             group=wall.wall_group,
                             orientation=wall.orientation.value,
                             hour=design_loads['design_hour'],
-                            latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                            latitude=float(outdoor_conditions['latitude'].replace('N', '')),
                             solar_absorptivity=wall.solar_absorptivity
                         ),
                         'load': load / 1000
@@ -862,7 +851,7 @@ class HVACCalculator:
                             'group': roof.roof_group,
                             'orientation': roof.orientation.value,
                             'hour': design_loads['design_hour'],
-                            'latitude': self.parse_latitude(outdoor_conditions['latitude']),
+                            'latitude': outdoor_conditions['latitude'],
                             'solar_absorptivity': roof.solar_absorptivity
                         })
                     results['detailed_loads']['roofs'].append({
@@ -876,7 +865,7 @@ class HVACCalculator:
                             group=roof.roof_group,
                             orientation=roof.orientation.value,
                             hour=design_loads['design_hour'],
-                            latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                            latitude=float(outdoor_conditions['latitude'].replace('N', '')),
                             solar_absorptivity=roof.solar_absorptivity
                         ),
                         'load': load / 1000
@@ -922,7 +911,7 @@ class HVACCalculator:
                     'shading_device': window.shading_device,
                     'shading_coefficient': window.shading_coefficient,
                     'scl': self.cooling_calculator.ashrae_tables.get_scl(
-                        latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                        latitude=outdoor_conditions['latitude'],
                         month=outdoor_conditions['month'].lower(),
                         orientation=window.orientation.value,
                         hour=design_loads['design_hour']
@@ -980,7 +969,7 @@ class HVACCalculator:
                     'drapery_type': skylight.drapery_type if hasattr(skylight, 'drapery_type') else 'None',
                     'shading_coefficient': skylight.shading_coefficient,
                     'scl': self.cooling_calculator.ashrae_tables.get_scl(
-                        latitude=self.parse_latitude(outdoor_conditions['latitude']),
+                        latitude=outdoor_conditions['latitude'],
                         month=outdoor_conditions['month'].lower(),
                         orientation='Horizontal',
                         hour=design_loads['design_hour']
@@ -1292,7 +1281,7 @@ class HVACCalculator:
                 results['detailed_loads']['floors'].append({
                     'name': floor.name,
                     'area': floor.area,
-                    'u_value': floor.u_value,  # FIXED: Corrected typo from previous version
+                    'u_value': floor.u_value,
                     'delta_t': indoor_conditions['temperature'] - outdoor_conditions['ground_temperature'],
                     'load': load / 1000
                 })