Update utils/solar.py

utils/solar.py

@@ -119,7 +119,22 @@ class SolarCalculations:
             h_o (W/m²·K), emissivity, absorptivity.
         """
         component_id = component.get('id', 'unknown_component')
-        component_type = component.get('component_type', ComponentType.WALL)
+        component_type = component.get('type', 'wall').lower()  # Changed to dictionary access
+
+        # Map string type to ComponentType enum
+        type_map = {
+            'walls': ComponentType.WALL,
+            'roofs': ComponentType.ROOF,
+            'floors': ComponentType.FLOOR,
+            'windows': ComponentType.WINDOW,
+            'skylights': ComponentType.SKYLIGHT,
+            'wall': ComponentType.WALL,
+            'roof': ComponentType.ROOF,
+            'floor': ComponentType.FLOOR,
+            'window': ComponentType.WINDOW,
+            'skylight': ComponentType.SKYLIGHT
+        }
+        component_type = type_map.get(component_type, ComponentType.WALL)
 
         # Default parameters
         if component_type == ComponentType.ROOF:
@@ -131,31 +146,31 @@ class SolarCalculations:
         elif component_type == ComponentType.FLOOR:
             surface_tilt = component.get('surface_tilt', 180.0)
             h_o = 17.0
-        else:  # WALL, DOOR, WINDOW
+        else:  # WALL, WINDOW
             surface_tilt = component.get('surface_tilt', 90.0)
             h_o = 17.0
 
         surface_azimuth = component.get('surface_azimuth', 0.0)
-        emissivity = component.get('emissivity', 0.9 if component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR] else None)
-        absorptivity = component.get('absorptivity', 0.6 if component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR] else 0.0)
+        emissivity = component.get('emissivity', 0.9 if component_type in [ComponentType.WALL, ComponentType.ROOF] else None)
+        absorptivity = component.get('absorptivity', 0.6 if component_type in [ComponentType.WALL, ComponentType.ROOF] else 0.0)
 
         try:
             # For windows and skylights, use shgc instead of absorptivity and adjust h_o
             if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                glazing_material = component.get('fenestration', None)
-                if not glazing_material:
+                fenestration_name = component.get('fenestration', None)  # Standardized to 'fenestration'
+                if not fenestration_name:
                     logger.warning(f"No fenestration defined for {component_id}. Using default SHGC=0.7, h_o={h_o}.")
                     absorptivity = component.get('shgc', 0.7)
                 else:
-                    glazing_material_obj = (self.project_glazing_materials.get(glazing_material) or
-                                           self.material_library.library_glazing_materials.get(glazing_material))
+                    glazing_material_obj = (self.project_glazing_materials.get(fenestration_name) or
+                                           self.material_library.library_glazing_materials.get(fenestration_name))
                     if not glazing_material_obj:
-                        logger.warning(f"Fenestration '{glazing_material}' not found for {component_id}. Using default SHGC=0.7, h_o={h_o}.")
+                        logger.warning(f"Fenestration '{fenestration_name}' not found for {component_id}. Using default SHGC=0.7, h_o={h_o}.")
                         absorptivity = component.get('shgc', 0.7)
                     else:
                         absorptivity = glazing_material_obj.get('shgc', component.get('shgc', 0.7))
                         h_o = glazing_material_obj.get('h_o', h_o)
-                        logger.debug(f"Using fenestration '{glazing_material}' for {component_id}: shgc={absorptivity}, h_o={h_o}")
+                        logger.debug(f"Using fenestration '{fenestration_name}' for {component_id}: shgc={absorptivity}, h_o={h_o}")
                 emissivity = None
 
             logger.debug(f"Surface parameters for {component_id}: tilt={surface_tilt:.2f}, azimuth={surface_azimuth:.2f}, "
@@ -178,12 +193,12 @@ class SolarCalculations:
                 surface_tilt = 180.0
                 h_o = 17.0
                 surface_azimuth = 0.0
-            else:  # WALL, DOOR, WINDOW
+            else:  # WALL, WINDOW
                 surface_tilt = 90.0
                 h_o = 17.0
                 surface_azimuth = 0.0
 
-            if component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR]:
+            if component_type in [ComponentType.WALL, ComponentType.ROOF]:
                 absorptivity = 0.6
                 emissivity = 0.9
             else:  # WINDOW, SKYLIGHT
@@ -235,7 +250,7 @@ class SolarCalculations:
             timezone (float): Timezone offset in hours.
             ground_reflectivity (float): Ground reflectivity (albedo, typically 0.2).
             components (Dict[str, List]): Dictionary of component lists (e.g., walls, windows) with id, area,
-                                         component_type, facade, construction, glazing_material, or door_material.
+                                         type, facade, construction, fenestration, or door_material.
 
         Returns:
             List[Dict]: List of results for each hour with GHI > 0, containing solar angles and per-component results.
@@ -268,7 +283,7 @@ class SolarCalculations:
 
         lambda_std = 15 * timezone  # Standard meridian longitude (°)
 
-        # Cache facade azimuths (used only for walls, doors, windows)
+        # Cache facade azimuths (used only for walls, windows)
         building_info = components.get("_building_info", {})
         facade_cache = {
             "A": building_info.get("orientation_angle", 0.0),
@@ -345,17 +360,16 @@ class SolarCalculations:
                         surface_tilt, surface_azimuth, h_o, emissivity, absorptivity = \
                             self.get_surface_parameters(comp, building_info)
                         
-                        # For windows/skylights, get SHGC from material
-                        shgc = 0.7  # Default
-                        if comp.component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                            glazing_material = getattr(comp, 'glazing_material', None)
-                            if glazing_material:
-                                glazing_material_obj = (self.project_glazing_materials.get(glazing_material.name) or
-                                    self.material_library.library_glazing_materials.get(glazing_material.name))
-                                if glazing_material_obj:
-                                    shgc = glazing_material_obj.shgc
-                                else:
-                                    logger.warning(f"Glazing material '{glazing_material.name}' not found for {comp.id}. Using default SHGC=0.7.")
+                        # For windows/skylights, get SHGC from component
+                        shgc = comp.get('shgc', 0.7)  # Changed to dictionary access
+                        fenestration_name = comp.get('fenestration', None)  # Standardized to 'fenestration'
+                        if fenestration_name:
+                            glazing_material_obj = (self.project_glazing_materials.get(fenestration_name) or
+                                                    self.material_library.library_glazing_materials.get(fenestration_name))
+                            if glazing_material_obj:
+                                shgc = glazing_material_obj.get('shgc', shgc)
+                            else:
+                                logger.warning(f"Fenestration '{fenestration_name}' not found for {comp.get('id', 'unknown_component')}. Using default SHGC={shgc}.")
 
                         # Calculate angle of incidence (θ)
                         cos_theta = (math.sin(math.radians(alpha)) * math.cos(math.radians(surface_tilt)) +
@@ -363,9 +377,9 @@ class SolarCalculations:
                                      math.cos(math.radians(azimuth - surface_azimuth)))
                         cos_theta = max(min(cos_theta, 1.0), 0.0)  # Clamp to [0, 1]
 
-                        logger.info(f"  Component {getattr(comp, 'id', 'unknown_component')} at {month}/{day}/{hour}: "
-                            f"surface_tilt={surface_tilt:.2f}, surface_tazimuth={surface_sazimuth:.2f}, "
-                            f"cos_theta={cos_theta:.2f}")
+                        logger.info(f"  Component {comp.get('id', 'unknown_component')} at {month}/{day}/{hour}: "
+                                   f"surface_tilt={surface_tilt:.2f}, surface_azimuth={surface_azimuth:.2f}, "  # Fixed typo
+                                   f"cos_theta={cos_theta:.2f}")
 
                         # Calculate total incident radiation (I_t)
                         view_factor = (1 - math.cos(math.radians(surface_tilt))) / 2
@@ -374,36 +388,36 @@ class SolarCalculations:
 
                         # Initialize result
                         comp_result = {
-                            "component_id": getattr(comp, 'id', 'unknown_component'),
+                            "component_id": comp.get('id', 'unknown_component'),
                             "total_incident_radiation": round(I_t, 2),
                             "absorptivity": round(absorptivity, 2),
                             "emissivity": round(emissivity, 2) if emissivity is not None else None
                         }
 
                         # Calculate sol-air temperature for opaque surfaces
-                        if comp.component_type in [ComponentType.WALL, ComponentType.ROOF, ComponentType.DOOR]:
-                            delta_R = 63.0 if comp.component_type == ComponentType.ROOF else 0.0
+                        if comp.get('type', '').lower() in ['walls', 'roofs']:
+                            delta_R = 63.0 if comp.get('type', '').lower() == 'roofs' else 0.0
                             sol_air_temp = outdoor_temp + (absorptivity * I_t - (emissivity or 0.9) * 
-                            delta_R) / h_o
+                                                           delta_R) / h_o
                             comp_result["sol_air_temp"] = round(sol_air_temp, 2)
                             logger.info(f"Sol-air temp for {comp_result['component_id']} at {month}/{day}/{hour}: {sol_air_temp:.2f}°C")
 
                         # Calculate solar heat gain for fenestration
-                        elif comp.component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                            glazing_type = self.GLAZING_TYPE_MAPPING.get(comp.name, 'Single Clear')
-                            iac = getattr(comp, 'iac', 1.0)  # Default internal shading
+                        elif comp.get('type', '').lower() in ['windows', 'skylights']:
+                            glazing_type = self.GLAZING_TYPE_MAPPING.get(comp.get('name', ''), 'Single Clear')
+                            iac = comp.get('shading_coefficient', 1.0)  # Changed to dictionary access, aligned with components.py
                             shgc_dynamic = shgc * self.calculate_dynamic_shgc(glazing_type, cos_theta)
-                            solar_heat_gain = comp.area * shgc_dynamic * I_t * iac / 1000  # kW
+                            solar_heat_gain = comp.get('area', 0.0) * shgc_dynamic * I_t * iac / 1000  # kW
                             comp_result["solar_heat_gain"] = round(solar_heat_gain, 2)
                             comp_result["shgc_dynamic"] = round(shgc_dynamic, 2)
                             logger.info(f"Solar heat gain for {comp_result['component_id']} at {month}/{day}/{hour}: "
-                                        f"{solar_heat_gain:.2f} kW (area={comp.area}, shgc_dynamic={shgc_dynamic:.2f}, "
-                                        f"I_t={I_t:.2f}, iac={iac})")
+                                       f"{solar_heat_gain:.2f} kW (area={comp.get('area', 0.0)}, shgc_dynamic={shgc_dynamic:.2f}, "
+                                       f"I_t={I_t:.2f}, iac={iac})")
                         
                         component_results.append(comp_result)
 
                     except Exception as e:
-                        component_id = getattr(comp, 'id', 'unknown_component')
+                        component_id = comp.get('id', 'unknown_component')
                         logger.error(f"Error processing component {component_id} at {month}/{day}/{hour}: {str(e)}")
                         continue