Update app/main.py

app/main.py

@@ -17,7 +17,7 @@ import uuid
 
 # Import application modules
 from app.building_info_form import BuildingInfoForm
-from app.component_selection import ComponentSelectionInterface, Orientation, ComponentType, Wall, Roof, Floor, Window, Door, Skylight, SurfaceColor, GlazingType, FrameType
+from app.component_selection import ComponentSelectionInterface, Orientation, ComponentType, Wall, Roof, Floor, Window, Door, Skylight, GlazingType, FrameType  # CHANGED: Removed SurfaceColor
 from app.results_display import ResultsDisplay
 from app.data_validation import DataValidation
 from app.data_persistence import DataPersistence
@@ -213,7 +213,11 @@ 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 enhanced window/skylight properties
+                # NEW: 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)"
+                # Validate enhanced window/skylight properties
                 if component_type in ['windows', 'skylights']:
                     if getattr(comp, 'shgc', 0) <= 0:
                         return False, f"Invalid SHGC for {component_type}: {comp.name}"
@@ -758,19 +762,19 @@ class HVACCalculator:
                     month=outdoor_conditions['month'],
                     hour=design_loads['design_hour'],
                     latitude=outdoor_conditions['latitude'],
-                    surface_color=wall.surface_color  # NEW: Surface color
+                    solar_absorptivity=wall.solar_absorptivity  # CHANGED: Replaced surface_color with solar_absorptivity
                 )
                 results['detailed_loads']['walls'].append({
                     'name': wall.name,
                     'orientation': wall.orientation.value,
                     'area': wall.area,
                     'u_value': wall.u_value,
-                    'surface_color': wall.surface_color,  # NEW: Surface color
+                    'solar_absorptivity': wall.solar_absorptivity,  # CHANGED: Replaced surface_color
                     'cltd': self.cooling_calculator.ashrae_tables.calculate_corrected_cltd_wall(
                         wall_group=wall.wall_group,
                         orientation=wall.orientation.value,
                         hour=design_loads['design_hour'],
-                        color=wall.surface_color,  # NEW: Use surface color
+                        solar_absorptivity=wall.solar_absorptivity,  # CHANGED: Pass solar_absorptivity directly
                         month=outdoor_conditions['month'],
                         latitude=outdoor_conditions['latitude'],
                         indoor_temp=indoor_conditions['temperature'],
@@ -787,18 +791,18 @@ class HVACCalculator:
                     month=outdoor_conditions['month'],
                     hour=design_loads['design_hour'],
                     latitude=outdoor_conditions['latitude'],
-                    surface_color=roof.surface_color  # NEW: Surface color
+                    solar_absorptivity=roof.solar_absorptivity  # CHANGED: Replaced surface_color with solar_absorptivity
                 )
                 results['detailed_loads']['roofs'].append({
                     'name': roof.name,
                     'orientation': roof.orientation.value,
                     'area': roof.area,
                     'u_value': roof.u_value,
-                    'surface_color': roof.surface_color,  # NEW: Surface color
+                    'solar_absorptivity': roof.solar_absorptivity,  # CHANGED: Replaced surface_color
                     'cltd': self.cooling_calculator.ashrae_tables.calculate_corrected_cltd_roof(
                         roof_group=roof.roof_group,
                         hour=design_loads['design_hour'],
-                        color=roof.surface_color,  # NEW: Use surface color
+                        solar_absorptivity=roof.solar_absorptivity,  # CHANGED: Pass solar_absorptivity directly
                         month=outdoor_conditions['month'],
                         latitude=outdoor_conditions['latitude'],
                         indoor_temp=indoor_conditions['temperature'],
@@ -809,7 +813,7 @@ class HVACCalculator:
             
             for window in building_components.get('windows', []):
                 # NEW: Apply drapery adjustment
-                adjusted_shgc = self.drapery_system.adjust_shgc(
+                adjusted_shgc = self.drapery.adjust_shgc(  # CHANGED: Fixed typo (drapery_system to drapery)
                     base_shgc=window.shgc,
                     glazing_type=window.glazing_type,
                     drapery_type=window.drapery_type if hasattr(window, 'drapery_type') else None
@@ -870,7 +874,7 @@ class HVACCalculator:
             
             # NEW: Skylights
             for skylight in building_components.get('skylights', []):
-                adjusted_shgc = self.drapery_system.adjust_shgc(
+                adjusted_shgc = self.drapery.adjust_shgc(  # CHANGED: Fixed typo (drapery_system to drapery)
                     base_shgc=skylight.shgc,
                     glazing_type=skylight.glazing_type,
                     drapery_type=skylight.drapery_type if hasattr(skylight, 'drapery_type') else None
@@ -1186,7 +1190,7 @@ class HVACCalculator:
                     'orientation': wall.orientation.value,
                     'area': wall.area,
                     'u_value': wall.u_value,
-                    'surface_color': wall.surface_color,  # NEW: Surface color
+                    'solar_absorptivity': wall.solar_absorptivity,  # CHANGED: Replaced surface_color
                     'delta_t': delta_t,
                     'load': load / 1000
                 })
@@ -1202,7 +1206,7 @@ class HVACCalculator:
                     'orientation': roof.orientation.value,
                     'area': roof.area,
                     'u_value': roof.u_value,
-                    'surface_color': roof.surface_color,  # NEW: Surface color
+                    'solar_absorptivity': roof.solar_absorptivity,  # CHANGED: Replaced surface_color
                     'delta_t': delta_t,
                     'load': load / 1000
                 })
@@ -1216,7 +1220,7 @@ class HVACCalculator:
                 results['detailed_loads']['floors'].append({
                     'name': floor.name,
                     'area': floor.area,
-                    'u_value': floor.area,
+                    'u_value': floor.area,  # CHANGED: Fixed typo (u_value was incorrectly set to area)
                     'delta_t': indoor_conditions['temperature'] - outdoor_conditions['ground_temperature'],
                     'load': load / 1000
                 })