Upload 4 files

app/component_selection.py

@@ -96,7 +96,7 @@ class Wall(BuildingComponent):
 @dataclass
 class Roof(BuildingComponent):
     roof_type: str = "Concrete"
-    roof_group: str = "1"  # Changed default to valid ASHRAE group
+    roof_group: str = "A"  # Changed to letter-based ASHRAE group
     slope: str = "Flat"
     absorptivity: float = 0.6
 
@@ -108,10 +108,10 @@ class Roof(BuildingComponent):
         if not 0 <= self.absorptivity <= 1:
             raise ValueError("Absorptivity must be between 0 and 1")
         # Validate roof_group
-        VALID_ROOF_GROUPS = {"1", "2", "3", "4", "5", "6", "7", "8"}
+        VALID_ROOF_GROUPS = {"A", "B", "C", "D", "E", "F", "G"}
         if self.roof_group not in VALID_ROOF_GROUPS:
-            st.warning(f"Invalid roof_group '{self.roof_group}' for roof '{self.name}'. Defaulting to '1'.")
-            self.roof_group = "1"
+            st.warning(f"Invalid roof_group '{self.roof_group}' for roof '{self.name}'. Defaulting to 'A'.")
+            self.roof_group = "A"
 
     def to_dict(self) -> dict:
         base_dict = super().to_dict()
@@ -207,8 +207,8 @@ class ReferenceData:
                 "Custom": {"u_value": 0.5, "absorptivity": 0.6, "wall_group": "A"}
             },
             "roof_types": {
-                "Concrete Roof": {"u_value": 0.3, "absorptivity": 0.6, "group": "1"},
-                "Metal Roof": {"u_value": 1.0, "absorptivity": 0.75, "group": "2"}
+                "Concrete Roof": {"u_value": 0.3, "absorptivity": 0.6, "group": "A"},
+                "Metal Roof": {"u_value": 1.0, "absorptivity": 0.75, "group": "B"}
             },
             "roof_ventilation_methods": {
                 "No Ventilation": 0.0,

app/main.py

@@ -452,7 +452,7 @@ class HVACCalculator:
                 'relative_humidity': location['monthly_humidity'].get('Jul', 50.0),
                 'ground_temperature': location['monthly_temps'].get('Jul', 20.0),
                 'month': 'Jul',
-                'latitude': f"{location['latitude']}N" if location['latitude'] >= 0 else f"{abs(location['latitude'])}S",
+                'latitude': location['latitude'],  # Pass raw latitude value, validation will happen in cooling_load.py
                 'wind_speed': building_info.get('wind_speed', 4.0),
                 'day_of_year': 204  # Approx. July 23
             }

data/building_components.py

@@ -226,10 +226,10 @@ class Wall(BuildingComponent):
 class Roof(BuildingComponent):
     """Class representing a roof component."""
     
-    VALID_ROOF_GROUPS = {"1", "2", "3", "4", "5", "6", "7", "8"}  # ASHRAE roof groups for CLTD
+    VALID_ROOF_GROUPS = {"A", "B", "C", "D", "E", "F", "G"}  # ASHRAE roof groups for CLTD
     
     roof_type: str = "Custom"  # Flat, Pitched, etc.
-    roof_group: str = "1"  # ASHRAE roof group
+    roof_group: str = "A"  # ASHRAE roof group
     pitch: float = 0.0  # Roof pitch in degrees
     has_suspended_ceiling: bool = False
     ceiling_plenum_height: float = 0.0  # m

utils/cooling_load.py

@@ -508,9 +508,16 @@ class CoolingLoadCalculator:
 
             roof_group = str(roof.roof_group).upper()
             if roof_group not in self.valid_roof_groups:
-                if st.session_state.get('debug_mode', False):
-                    logger.warning(f"Invalid roof group: {roof_group}. Defaulting to 'A'")
-                roof_group = 'A'
+                # Map numeric roof groups to letter groups
+                numeric_map = {'1': 'A', '2': 'B', '3': 'C', '4': 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'G'}
+                if roof_group in numeric_map:
+                    roof_group = numeric_map[roof_group]
+                    if st.session_state.get('debug_mode', False):
+                        logger.info(f"Mapped roof_group {roof.roof_group} to {roof_group}")
+                else:
+                    if st.session_state.get('debug_mode', False):
+                        logger.warning(f"Invalid roof group: {roof_group}. Defaulting to 'A'")
+                    roof_group = 'A'
             
             try:
                 cltd = self.ashrae_tables.calculate_corrected_cltd_roof(