Update utils/solar.py

utils/solar.py

@@ -4,6 +4,7 @@ import math
 from datetime import datetime
 from app.materials_library import MaterialLibrary, GlazingMaterial, Material
 from utils.ctf_calculations import ComponentType
+from app.m_c_data import DEFAULT_WINDOW_PROPERTIES  # Import for h_o default
 import logging
 
 # Configure logging
@@ -118,8 +119,8 @@ class SolarCalculations:
             Tuple[float, float, float, Optional[float], float]: Surface tilt (°), surface azimuth (°),
             h_o (W/m²·K), emissivity, absorptivity.
         """
-        component_id = component.get('id', 'unknown_component')
-        component_type = component.get('type', 'wall').lower()  # Changed to dictionary access
+        component_name = component.get('name', 'unknown_component')
+        component_type = component.get('type', 'wall').lower()
 
         # Map string type to ComponentType enum
         type_map = {
@@ -142,44 +143,36 @@ class SolarCalculations:
             h_o = 23.0
         elif component_type == ComponentType.SKYLIGHT:
             surface_tilt = component.get('surface_tilt', 0.0)
-            h_o = 23.0
+            h_o = component.get('h_o', DEFAULT_WINDOW_PROPERTIES["h_o"])
         elif component_type == ComponentType.FLOOR:
             surface_tilt = component.get('surface_tilt', 180.0)
             h_o = 17.0
         else:  # WALL, WINDOW
             surface_tilt = component.get('surface_tilt', 90.0)
-            h_o = 17.0
+            h_o = component.get('h_o', DEFAULT_WINDOW_PROPERTIES["h_o"]) if component_type == ComponentType.WINDOW else 17.0
 
         surface_azimuth = component.get('surface_azimuth', 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
+            # For windows and skylights, use shgc instead of absorptivity
             if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                fenestration_name = component.get('fenestration', None)  # Standardized to 'fenestration'
+                fenestration_name = component.get('fenestration', None)
                 if not fenestration_name:
-                    logger.warning(f"No fenestration defined for {component_id}. Using default SHGC=0.7, h_o={h_o}.")
+                    logger.warning(f"No fenestration defined for {component_name}. Using default SHGC=0.7, h_o={h_o}.")
                     absorptivity = component.get('shgc', 0.7)
                 else:
-                    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 '{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 '{fenestration_name}' for {component_id}: shgc={absorptivity}, h_o={h_o}")
-                emissivity = None
+                    absorptivity = component.get('shgc', 0.7)
+                    logger.debug(f"Using component-stored SHGC for {component_name}: shgc={absorptivity}, h_o={h_o}")
 
-            logger.debug(f"Surface parameters for {component_id}: tilt={surface_tilt:.2f}, azimuth={surface_azimuth:.2f}, "
+            logger.debug(f"Surface parameters for {component_name}: tilt={surface_tilt:.2f}, azimuth={surface_azimuth:.2f}, "
                         f"h_o={h_o:.2f}, emissivity={emissivity}, absorptivity={absorptivity}")
 
             return surface_tilt, surface_azimuth, h_o, emissivity, absorptivity
 
         except Exception as e:
-            logger.error(f"Error retrieving surface parameters for {component_id}: {str(e)}")
+            logger.error(f"Error retrieving surface parameters for {component_name}: {str(e)}")
             # Apply defaults
             if component_type == ComponentType.ROOF:
                 surface_tilt = 0.0
@@ -187,7 +180,7 @@ class SolarCalculations:
                 surface_azimuth = 0.0
             elif component_type == ComponentType.SKYLIGHT:
                 surface_tilt = 0.0
-                h_o = 23.0
+                h_o = DEFAULT_WINDOW_PROPERTIES["h_o"]
                 surface_azimuth = 0.0
             elif component_type == ComponentType.FLOOR:
                 surface_tilt = 180.0
@@ -195,7 +188,7 @@ class SolarCalculations:
                 surface_azimuth = 0.0
             else:  # WALL, WINDOW
                 surface_tilt = 90.0
-                h_o = 17.0
+                h_o = DEFAULT_WINDOW_PROPERTIES["h_o"] if component_type == ComponentType.WINDOW else 17.0
                 surface_azimuth = 0.0
 
             if component_type in [ComponentType.WALL, ComponentType.ROOF]:
@@ -205,7 +198,7 @@ class SolarCalculations:
                 absorptivity = 0.7
                 emissivity = None
 
-            logger.info(f"Default surface parameters for {component_id}: tilt={surface_tilt:.1f}, azimuth={surface_azimuth:.1f}, h_o={h_o:.1f}")
+            logger.info(f"Default surface parameters for {component_name}: tilt={surface_tilt:.1f}, azimuth={surface_azimuth:.1f}, h_o={h_o:.1f}")
             return surface_tilt, surface_azimuth, h_o, emissivity, absorptivity
 
     @staticmethod
@@ -361,15 +354,8 @@ class SolarCalculations:
                             self.get_surface_parameters(comp, building_info)
                         
                         # 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}.")
+                        shgc = comp.get('shgc', 0.7)
+                        fenestration_name = comp.get('fenestration', None)
 
                         # Calculate angle of incidence (θ)
                         cos_theta = (math.sin(math.radians(alpha)) * math.cos(math.radians(surface_tilt)) +
@@ -377,8 +363,8 @@ 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 {comp.get('id', 'unknown_component')} at {month}/{day}/{hour}: "
-                                   f"surface_tilt={surface_tilt:.2f}, surface_azimuth={surface_azimuth:.2f}, "  # Fixed typo
+                        logger.info(f"  Component {comp.get('name', 'unknown_component')} at {month}/{day}/{hour}: "
+                                   f"surface_tilt={surface_tilt:.2f}, surface_azimuth={surface_azimuth:.2f}, "
                                    f"cos_theta={cos_theta:.2f}")
 
                         # Calculate total incident radiation (I_t)
@@ -388,7 +374,7 @@ class SolarCalculations:
 
                         # Initialize result
                         comp_result = {
-                            "component_id": comp.get('id', 'unknown_component'),
+                            "component_id": comp.get('name', 'unknown_component'),
                             "total_incident_radiation": round(I_t, 2),
                             "absorptivity": round(absorptivity, 2),
                             "emissivity": round(emissivity, 2) if emissivity is not None else None
@@ -404,8 +390,8 @@ class SolarCalculations:
 
                         # Calculate solar heat gain for fenestration
                         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
+                            glazing_type = self.GLAZING_TYPE_MAPPING.get(comp.get('fenestration', ''), 'Single Clear')
+                            iac = comp.get('shading_coefficient', 1.0)
                             shgc_dynamic = shgc * self.calculate_dynamic_shgc(glazing_type, cos_theta)
                             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)
@@ -417,8 +403,8 @@ class SolarCalculations:
                         component_results.append(comp_result)
 
                     except Exception as e:
-                        component_id = comp.get('id', 'unknown_component')
-                        logger.error(f"Error processing component {component_id} at {month}/{day}/{hour}: {str(e)}")
+                        component_name = comp.get('name', 'unknown_component')
+                        logger.error(f"Error processing component {component_name} at {month}/{day}/{hour}: {str(e)}")
                         continue
 
             # Store results for this hour