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, GlazingType, FrameType  # CHANGED: Removed SurfaceColor
+from app.component_selection import ComponentSelectionInterface, Orientation, ComponentType, Wall, Roof, Floor, Window, Door, Skylight, GlazingType, FrameType
 from app.results_display import ResultsDisplay
 from app.data_validation import DataValidation
 from app.data_persistence import DataPersistence
@@ -41,7 +41,7 @@ from utils.component_visualization import ComponentVisualization
 from utils.scenario_comparison import ScenarioComparisonVisualization
 from utils.psychrometric_visualization import PsychrometricVisualization
 from utils.time_based_visualization import TimeBasedVisualization
-from data.drapery import Drapery  # NEW: Drapery adjustments
+from data.drapery import Drapery
 
 # NEW: ASHRAE 62.1 Ventilation Rates (Table 6.1)
 VENTILATION_RATES = {
@@ -75,7 +75,7 @@ class HVACCalculator:
                 'floors': [],
                 'windows': [],
                 'doors': [],
-                'skylights': []  # NEW: Added skylights
+                'skylights': []
             }
         
         if 'internal_loads' not in st.session_state:
@@ -109,7 +109,7 @@ class HVACCalculator:
         self.data_export = DataExport()
         self.cooling_calculator = CoolingLoadCalculator()
         self.heating_calculator = HeatingLoadCalculator()
-        self.drapery = Drapery()  # NEW: Drapery system
+        self.drapery = Drapery()
         
         # Persist ClimateData in session_state
         if 'climate_data_obj' not in st.session_state:
@@ -259,7 +259,7 @@ class HVACCalculator:
                     existing_load['activity_level'] == new_load['activity_level'] and
                     existing_load['zone_type'] == new_load['zone_type'] and
                     existing_load['hours_in_operation'] == new_load['hours_in_operation'] and
-                    existing_load['latent_gain'] == new_load['latent_gain']):  # NEW: Added latent_gain
+                    existing_load['latent_gain'] == new_load['latent_gain']):
                     return False, f"Duplicate people load '{new_load['name']}' already exists."
             elif load_type == 'lighting':
                 if (existing_load['name'] == new_load['name'] and
@@ -306,15 +306,15 @@ class HVACCalculator:
                 )
                 zone_type = st.selectbox(
                     "Zone Type",
-                    ["A", "B", "C", "D"],  # NEW: Updated per Plan.txt
+                    ["A", "B", "C", "D"],
                     help="Select zone type for CLF accuracy per ASHRAE"
                 )
                 hours_in_operation = st.selectbox(
-                    "Hours Occupied",  # NEW: Updated label per Plan.txt
-                    ["2h", "4h", "6h"],  # NEW: Updated options per Plan.txt
+                    "Hours Occupied",
+                    ["2h", "4h", "6h"],
                     help="Select hours of occupancy for CLF calculations"
                 )
-                latent_gain = st.number_input(  # NEW: Added per Plan.txt
+                latent_gain = st.number_input(
                     "Latent Gain per Person (Btu/h)",
                     min_value=0.0,
                     max_value=500.0,
@@ -332,7 +332,7 @@ class HVACCalculator:
                         "activity_level": activity_level,
                         "zone_type": zone_type,
                         "hours_in_operation": hours_in_operation,
-                        "latent_gain": latent_gain  # NEW: Added per Plan.txt
+                        "latent_gain": latent_gain
                     }
                     is_valid, message = self.validate_internal_load('people', people_load)
                     if is_valid:
@@ -378,12 +378,12 @@ class HVACCalculator:
                 )
                 zone_type = st.selectbox(
                     "Zone Type",
-                    ["A", "B", "C", "D"],  # NEW: Updated per Plan.txt
+                    ["A", "B", "C", "D"],
                     help="Select zone type for CLF accuracy per ASHRAE"
                 )
                 hours_in_operation = st.selectbox(
-                    "Hours On",  # NEW: Updated label per Plan.txt
-                    ["8h", "10h", "12h"],  # NEW: Updated options per Plan.txt
+                    "Hours On",
+                    ["8h", "10h", "12h"],
                     help="Select hours of lighting operation for CLF calculations"
                 )
                 lighting_name = st.text_input("Name", value="General Lighting")
@@ -449,12 +449,12 @@ class HVACCalculator:
                 )
                 zone_type = st.selectbox(
                     "Zone Type",
-                    ["A", "B", "C", "D"],  # NEW: Updated per Plan.txt
+                    ["A", "B", "C", "D"],
                     help="Select zone type for CLF accuracy per ASHRAE"
                 )
                 hours_in_operation = st.selectbox(
-                    "Hours Operated",  # NEW: Updated label per Plan.txt
-                    ["2h", "4h", "6h"],  # NEW: Updated options per Plan.txt
+                    "Hours Operated",
+                    ["2h", "4h", "6h"],
                     help="Select hours of equipment operation for CLF calculations"
                 )
                 equipment_name = st.text_input("Name", value="Office Equipment")
@@ -524,7 +524,7 @@ class HVACCalculator:
                             step=0.1,
                             help="Custom ventilation rate per floor area (ASHRAE 62.1)"
                         )
-                        ventilation_rate = st.number_input(  # NEW: Added per Plan.txt
+                        ventilation_rate = st.number_input(
                             "Ventilation Rate (m³/s)",
                             min_value=0.0,
                             max_value=10.0,
@@ -537,7 +537,7 @@ class HVACCalculator:
                         area_rate = VENTILATION_RATES[zone_type]["area_rate"]
                         st.write(f"People Rate: {people_rate} L/s/person (ASHRAE 62.1)")
                         st.write(f"Area Rate: {area_rate} L/s/m² (ASHRAE 62.1)")
-                        ventilation_rate = st.number_input(  # NEW: Added per Plan.txt
+                        ventilation_rate = st.number_input(
                             "Ventilation Rate (m³/s)",
                             min_value=0.0,
                             max_value=10.0,
@@ -618,16 +618,16 @@ class HVACCalculator:
             # Format conditions
             outdoor_conditions = {
                 'temperature': location['summer_design_temp_db'],
-                'relative_humidity': building_info.get('outdoor_rh', location['monthly_humidity'].get('Jul', 50.0)),  # NEW: Use UI input
+                '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'],
-                'wind_speed': building_info.get('wind_speed', 4.0),  # NEW: Use UI input
-                'day_of_year': month_to_day.get('Jul', 182)  # NEW: Derive from month
+                'wind_speed': building_info.get('wind_speed', 4.0),
+                'day_of_year': month_to_day.get('Jul', 182)
             }
             indoor_conditions = {
                 'temperature': building_info.get('indoor_temp', 24.0),
-                'relative_humidity': building_info.get('indoor_rh', 50.0)  # NEW: Use UI input
+                'relative_humidity': building_info.get('indoor_rh', 50.0)
             }
             
             if st.session_state.get('debug_mode', False):
@@ -649,31 +649,31 @@ 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'),
-                    'operating_hours': internal_loads.get('people', [{}])[0].get('hours_in_operation', '8h'),  # NEW: Use updated hours
-                    'zone_type': internal_loads.get('people', [{}])[0].get('zone_type', 'A'),  # NEW: Use updated zone type
-                    'latent_gain': internal_loads.get('people', [{}])[0].get('latent_gain', 200.0)  # NEW: Added latent gain
+                    'operating_hours': internal_loads.get('people', [{}])[0].get('hours_in_operation', '8h'),
+                    'zone_type': internal_loads.get('people', [{}])[0].get('zone_type', 'A'),
+                    'latent_gain': internal_loads.get('people', [{}])[0].get('latent_gain', 200.0)
                 },
                 'lights': {
                     'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
                     'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8),
                     'special_allowance': 0.1,
-                    'hours_operation': internal_loads.get('lighting', [{}])[0].get('hours_in_operation', '8h'),  # NEW: Use updated hours
-                    'zone_type': internal_loads.get('lighting', [{}])[0].get('zone_type', 'A')  # NEW: Use updated zone type
+                    'hours_operation': internal_loads.get('lighting', [{}])[0].get('hours_in_operation', '8h'),
+                    'zone_type': internal_loads.get('lighting', [{}])[0].get('zone_type', 'A')
                 },
                 'equipment': {
                     'power': sum(load['power'] for load in internal_loads.get('equipment', [])),
                     'use_factor': internal_loads.get('equipment', [{}])[0].get('usage_factor', 0.7),
                     'radiation_factor': internal_loads.get('equipment', [{}])[0].get('radiation_fraction', 0.3),
-                    'hours_operation': internal_loads.get('equipment', [{}])[0].get('hours_in_operation', '8h'),  # NEW: Use updated hours
-                    'zone_type': internal_loads.get('equipment', [{}])[0].get('zone_type', 'A')  # NEW: Use updated zone type
+                    'hours_operation': internal_loads.get('equipment', [{}])[0].get('hours_in_operation', '8h'),
+                    'zone_type': internal_loads.get('equipment', [{}])[0].get('zone_type', 'A')
                 },
                 'infiltration': {
-                    'flow_rate': building_info.get('infiltration_rate', 0.05),
-                    'height': building_info.get('building_height', 3.0),  # NEW: Use UI input
+                    'flow_rate': building_info.get('infiltration_rate', 0.5),
+                    '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)  # NEW: Use UI input
+                    'flow_rate': building_info.get('ventilation_rate', 0.1)
                 },
                 'operating_hours': building_info.get('operating_hours', '8:00-18:00')
             }
@@ -723,7 +723,7 @@ class HVACCalculator:
                     'roof': design_loads['roofs'] / 1000,
                     'windows': (design_loads['windows_conduction'] + design_loads['windows_solar']) / 1000,
                     'doors': design_loads['doors'] / 1000,
-                    'skylights': design_loads.get('skylights', 0) / 1000,  # NEW: Skylights
+                    'skylights': design_loads.get('skylights', 0) / 1000,
                     'people': (design_loads['people_sensible'] + design_loads['people_latent']) / 1000,
                     'lighting': design_loads['lights'] / 1000,
                     'equipment': (design_loads['equipment_sensible'] + design_loads['equipment_latent']) / 1000,
@@ -735,7 +735,7 @@ class HVACCalculator:
                     'roofs': [],
                     'windows': [],
                     'doors': [],
-                    'skylights': [],  # NEW: Skylights
+                    'skylights': [],
                     'internal': [],
                     'infiltration': {
                         'air_flow': formatted_internal_loads['infiltration']['flow_rate'],
@@ -762,23 +762,22 @@ class HVACCalculator:
                     month=outdoor_conditions['month'],
                     hour=design_loads['design_hour'],
                     latitude=outdoor_conditions['latitude'],
-                    solar_absorptivity=wall.solar_absorptivity  # CHANGED: Replaced surface_color with solar_absorptivity
+                    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,  # CHANGED: Replaced surface_color
-                    'cltd': self.cooling_calculator.ashrae_tables.calculate_corrected_cltd_wall(
-                        wall_group=wall.wall_group,
+                    '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'],
-                        solar_absorptivity=wall.solar_absorptivity,  # CHANGED: Pass solar_absorptivity directly
-                        month=outdoor_conditions['month'],
-                        latitude=outdoor_conditions['latitude'],
-                        indoor_temp=indoor_conditions['temperature'],
-                        outdoor_temp=outdoor_conditions['temperature']
+                        latitude=float(outdoor_conditions['latitude'].replace('N', '')),
+                        solar_absorptivity=wall.solar_absorptivity,
+                        month=outdoor_conditions['month'].lower()
                     ),
                     'load': load / 1000
                 })
@@ -791,29 +790,28 @@ class HVACCalculator:
                     month=outdoor_conditions['month'],
                     hour=design_loads['design_hour'],
                     latitude=outdoor_conditions['latitude'],
-                    solar_absorptivity=roof.solar_absorptivity  # CHANGED: Replaced surface_color with solar_absorptivity
+                    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,  # CHANGED: Replaced surface_color
-                    'cltd': self.cooling_calculator.ashrae_tables.calculate_corrected_cltd_roof(
-                        roof_group=roof.roof_group,
+                    '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'],
-                        solar_absorptivity=roof.solar_absorptivity,  # CHANGED: Pass solar_absorptivity directly
-                        month=outdoor_conditions['month'],
-                        latitude=outdoor_conditions['latitude'],
-                        indoor_temp=indoor_conditions['temperature'],
-                        outdoor_temp=outdoor_conditions['temperature']
+                        latitude=float(outdoor_conditions['latitude'].replace('N', '')),
+                        solar_absorptivity=roof.solar_absorptivity,
+                        month=outdoor_conditions['month'].lower()
                     ),
                     'load': load / 1000
                 })
             
             for window in building_components.get('windows', []):
-                # NEW: Apply drapery adjustment
-                adjusted_shgc = self.drapery.adjust_shgc(  # CHANGED: Fixed typo (drapery_system to drapery)
+                adjusted_shgc = self.drapery.adjust_shgc(
                     base_shgc=window.shgc,
                     glazing_type=window.glazing_type,
                     drapery_type=window.drapery_type if hasattr(window, 'drapery_type') else None
@@ -826,9 +824,9 @@ class HVACCalculator:
                     hour=design_loads['design_hour'],
                     latitude=outdoor_conditions['latitude'],
                     shading_coefficient=window.shading_coefficient,
-                    adjusted_shgc=adjusted_shgc,  # NEW: Adjusted SHGC
-                    glazing_type=window.glazing_type,  # NEW: Glazing type
-                    frame_type=window.frame_type  # NEW: Frame type
+                    adjusted_shgc=adjusted_shgc,
+                    glazing_type=window.glazing_type,
+                    frame_type=window.frame_type
                 )
                 if 'total' not in load_dict:
                     if 'conduction' in load_dict and 'solar' in load_dict:
@@ -842,15 +840,15 @@ class HVACCalculator:
                     'area': window.area,
                     'u_value': window.u_value,
                     'shgc': window.shgc,
-                    'adjusted_shgc': adjusted_shgc,  # NEW: Adjusted SHGC
-                    'glazing_type': window.glazing_type,  # NEW: Glazing type
-                    'frame_type': window.frame_type,  # NEW: Frame type
-                    'drapery_type': window.drapery_type if hasattr(window, 'drapery_type') else 'None',  # NEW: Drapery
+                    'adjusted_shgc': adjusted_shgc,
+                    'glazing_type': window.glazing_type,
+                    'frame_type': window.frame_type,
+                    'drapery_type': window.drapery_type if hasattr(window, 'drapery_type') else 'None',
                     'shading_device': window.shading_device,
                     'shading_coefficient': window.shading_coefficient,
                     'scl': self.cooling_calculator.ashrae_tables.get_scl(
-                        latitude=outdoor_conditions['latitude'],
-                        month=outdoor_conditions['month'].title(),
+                        latitude=float(outdoor_conditions['latitude'].replace('N', '')),
+                        month=outdoor_conditions['month'].lower(),
                         orientation=window.orientation.value,
                         hour=design_loads['design_hour']
                     ),
@@ -872,9 +870,8 @@ class HVACCalculator:
                     'load': load / 1000
                 })
             
-            # NEW: Skylights
             for skylight in building_components.get('skylights', []):
-                adjusted_shgc = self.drapery.adjust_shgc(  # CHANGED: Fixed typo (drapery_system to drapery)
+                adjusted_shgc = self.drapery.adjust_shgc(
                     base_shgc=skylight.shgc,
                     glazing_type=skylight.glazing_type,
                     drapery_type=skylight.drapery_type if hasattr(skylight, 'drapery_type') else None
@@ -908,9 +905,9 @@ 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=outdoor_conditions['latitude'],
-                        month=outdoor_conditions['month'].title(),
-                        orientation='Horizontal',  # Skylights are horizontal
+                        latitude=float(outdoor_conditions['latitude'].replace('N', '')),
+                        month=outdoor_conditions['month'].lower(),
+                        orientation='Horizontal',
                         hour=design_loads['design_hour']
                     ),
                     'load': load_dict['total'] / 1000
@@ -923,7 +920,7 @@ class HVACCalculator:
                             num_people=load['num_people'],
                             activity_level=load['activity_level'],
                             hour=design_loads['design_hour'],
-                            latent_gain=load.get('latent_gain', 200.0)  # NEW: Pass latent gain
+                            latent_gain=load.get('latent_gain', 200.0)
                         )
                         if 'total' not in load_dict and ('sensible' in load_dict or 'latent' in load_dict):
                             load_dict['total'] = load_dict.get('sensible', 0) + load_dict.get('latent', 0)
@@ -1023,7 +1020,7 @@ class HVACCalculator:
             
             # Skip heating calculation if outdoor temp exceeds indoor temp
             indoor_temp = building_info.get('indoor_temp', 21.0)
-            outdoor_temp = building_info.get('winter_temp', location['winter_design_temp'])  # NEW: Use UI input if available
+            outdoor_temp = building_info.get('winter_temp', location['winter_design_temp'])
             if outdoor_temp >= indoor_temp:
                 results = {
                     'total_load': 0.0,
@@ -1036,7 +1033,7 @@ class HVACCalculator:
                         'floor': 0.0,
                         'windows': 0.0,
                         'doors': 0.0,
-                        'skylights': 0.0,  # NEW: Skylights
+                        'skylights': 0.0,
                         'infiltration': 0.0,
                         'ventilation': 0.0
                     },
@@ -1046,7 +1043,7 @@ class HVACCalculator:
                         'floors': [],
                         'windows': [],
                         'doors': [],
-                        'skylights': [],  # NEW: Skylights
+                        'skylights': [],
                         'infiltration': {'air_flow': 0.0, 'delta_t': 0.0, 'load': 0.0},
                         'ventilation': {'air_flow': 0.0, 'delta_t': 0.0, 'load': 0.0}
                     },
@@ -1056,14 +1053,14 @@ class HVACCalculator:
             
             # Format conditions
             outdoor_conditions = {
-                'design_temperature': outdoor_temp,  # NEW: Use UI input
-                'design_relative_humidity': building_info.get('outdoor_rh', location['monthly_humidity'].get('Jan', 80.0)),  # NEW: Use UI input
+                'design_temperature': outdoor_temp,
+                'design_relative_humidity': building_info.get('outdoor_rh', location['monthly_humidity'].get('Jan', 80.0)),
                 'ground_temperature': ground_temperature,
-                'wind_speed': building_info.get('wind_speed', 4.0)  # NEW: Use UI input
+                'wind_speed': building_info.get('wind_speed', 4.0)
             }
             indoor_conditions = {
                 'temperature': indoor_temp,
-                'relative_humidity': building_info.get('indoor_rh', 40.0)  # NEW: Use UI input
+                'relative_humidity': building_info.get('indoor_rh', 40.0)
             }
             
             if st.session_state.get('debug_mode', False):
@@ -1096,29 +1093,29 @@ class HVACCalculator:
                         internal_loads.get('people', [{}])[0].get('activity_level', 'Seated/Resting'),
                         70.0
                     ),
-                    'latent_gain': internal_loads.get('people', [{}])[0].get('latent_gain', 200.0),  # NEW: Added latent gain
-                    'operating_hours': internal_loads.get('people', [{}])[0].get('hours_in_operation', '8h'),  # NEW: Use updated hours
-                    'zone_type': internal_loads.get('people', [{}])[0].get('zone_type', 'A')  # NEW: Use updated zone type
+                    'latent_gain': internal_loads.get('people', [{}])[0].get('latent_gain', 200.0),
+                    'operating_hours': internal_loads.get('people', [{}])[0].get('hours_in_operation', '8h'),
+                    'zone_type': internal_loads.get('people', [{}])[0].get('zone_type', 'A')
                 },
                 'lights': {
                     'power': sum(load['power'] for load in internal_loads.get('lighting', [])),
                     'use_factor': internal_loads.get('lighting', [{}])[0].get('usage_factor', 0.8),
-                    'hours_operation': internal_loads.get('lighting', [{}])[0].get('hours_in_operation', '8h'),  # NEW: Use updated hours
-                    'zone_type': internal_loads.get('lighting', [{}])[0].get('zone_type', 'A')  # NEW: Use updated zone type
+                    'hours_operation': internal_loads.get('lighting', [{}])[0].get('hours_in_operation', '8h'),
+                    'zone_type': internal_loads.get('lighting', [{}])[0].get('zone_type', 'A')
                 },
                 'equipment': {
                     'power': sum(load['power'] for load in internal_loads.get('equipment', [])),
                     'use_factor': internal_loads.get('equipment', [{}])[0].get('usage_factor', 0.7),
-                    'hours_operation': internal_loads.get('equipment', [{}])[0].get('hours_in_operation', '8h'),  # NEW: Use updated hours
-                    'zone_type': internal_loads.get('equipment', [{}])[0].get('zone_type', 'A')  # NEW: Use updated zone type
+                    'hours_operation': internal_loads.get('equipment', [{}])[0].get('hours_in_operation', '8h'),
+                    'zone_type': internal_loads.get('equipment', [{}])[0].get('zone_type', 'A')
                 },
                 'infiltration': {
                     'flow_rate': building_info.get('infiltration_rate', 0.05),
-                    'height': building_info.get('building_height', 3.0),  # NEW: Use UI input
+                    '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)  # NEW: Use UI input
+                    'flow_rate': building_info.get('ventilation_rate', 0.1)
                 },
                 'usage_factor': 0.7,
                 'operating_hours': building_info.get('operating_hours', '8:00-18:00')
@@ -1152,7 +1149,7 @@ class HVACCalculator:
                     'floor': design_loads['floors'] / 1000,
                     'windows': design_loads['windows'] / 1000,
                     'doors': design_loads['doors'] / 1000,
-                    'skylights': design_loads.get('skylights', 0) / 1000,  # NEW: Skylights
+                    'skylights': design_loads.get('skylights', 0) / 1000,
                     'infiltration': (design_loads['infiltration_sensible'] + design_loads['infiltration_latent']) / 1000,
                     'ventilation': (design_loads['ventilation_sensible'] + design_loads['ventilation_latent']) / 1000
                 },
@@ -1162,7 +1159,7 @@ class HVACCalculator:
                     'floors': [],
                     'windows': [],
                     'doors': [],
-                    'skylights': [],  # NEW: Skylights
+                    'skylights': [],
                     'infiltration': {
                         'air_flow': formatted_internal_loads['infiltration']['flow_rate'],
                         'delta_t': indoor_conditions['temperature'] - outdoor_conditions['design_temperature'],
@@ -1190,7 +1187,7 @@ class HVACCalculator:
                     'orientation': wall.orientation.value,
                     'area': wall.area,
                     'u_value': wall.u_value,
-                    'solar_absorptivity': wall.solar_absorptivity,  # CHANGED: Replaced surface_color
+                    'solar_absorptivity': wall.solar_absorptivity,
                     'delta_t': delta_t,
                     'load': load / 1000
                 })
@@ -1206,7 +1203,7 @@ class HVACCalculator:
                     'orientation': roof.orientation.value,
                     'area': roof.area,
                     'u_value': roof.u_value,
-                    'solar_absorptivity': roof.solar_absorptivity,  # CHANGED: Replaced surface_color
+                    'solar_absorptivity': roof.solar_absorptivity,
                     'delta_t': delta_t,
                     'load': load / 1000
                 })
@@ -1230,15 +1227,15 @@ class HVACCalculator:
                     window=window,
                     outdoor_temp=outdoor_conditions['design_temperature'],
                     indoor_temp=indoor_conditions['temperature'],
-                    frame_type=window.frame_type  # NEW: Frame type
+                    frame_type=window.frame_type
                 )
                 results['detailed_loads']['windows'].append({
                     'name': window.name,
                     'orientation': window.orientation.value,
                     'area': window.area,
                     'u_value': window.u_value,
-                    'glazing_type': window.glazing_type,  # NEW: Glazing type
-                    'frame_type': window.frame_type,  # NEW: Frame type
+                    'glazing_type': window.glazing_type,
+                    'frame_type': window.frame_type,
                     'delta_t': delta_t,
                     'load': load / 1000
                 })
@@ -1258,7 +1255,6 @@ class HVACCalculator:
                     'load': load / 1000
                 })
             
-            # NEW: Skylights
             for skylight in building_components.get('skylights', []):
                 load = self.heating_calculator.calculate_skylight_heating_load(
                     skylight=skylight,