Update app/hvac_loads.py

app/hvac_loads.py

@@ -181,94 +181,40 @@ class TFMCalculations:
         component_name = component.get('name', 'unnamed_component')
         component_type = TFMCalculations.get_component_type(component)
         
-        surface_tilt = 90.0
-        surface_azimuth = 0.0
-        h_o = 17.0
-        emissivity = 0.9
-        absorptivity = 0.6
+        # Default parameters
+        surface_tilt = component.get('surface_tilt', 90.0 if component_type in [ComponentType.WALL, ComponentType.WINDOW] else 
+                                    0.0 if component_type in [ComponentType.ROOF, ComponentType.SKYLIGHT] else 180.0)
+        surface_azimuth = component.get('surface_azimuth', 0.0)
+        h_o = 17.0 if component_type in [ComponentType.WALL, ComponentType.WINDOW, ComponentType.FLOOR] else 23.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:
-            if component_type == ComponentType.ROOF:
-                surface_tilt = component.get('tilt', 0.0)
-                h_o = 23.0
-                surface_azimuth = component.get('orientation', 0.0)
-                logger.debug(f"Roof component {component_name}: using orientation={surface_azimuth}, tilt={surface_tilt}")
-                
-            elif component_type == ComponentType.SKYLIGHT:
-                surface_tilt = component.get('tilt', 0.0)
-                h_o = 23.0
-                surface_azimuth = component.get('orientation', 0.0)
-                logger.debug(f"Skylight component {component_name}: using orientation={surface_azimuth}, tilt={surface_tilt}")
-                
-            elif component_type == ComponentType.FLOOR:
-                surface_tilt = 180.0
-                h_o = 17.0
-                surface_azimuth = 0.0
-                logger.debug(f"Floor component {component_name}: using default azimuth={surface_azimuth}, tilt={surface_tilt}")
-                
-            else:  # WALL, WINDOW
-                surface_tilt = 90.0
-                h_o = 17.0
-                elevation = component.get('elevation', None)
-                if not elevation:
-                    logger.warning(f"Component {component_name} ({component_type.value}) is missing 'elevation' field. Using default azimuth=0.")
-                    surface_azimuth = 0.0
-                else:
-                    base_azimuth = building_info.get("orientation_angle", 0.0)
-                    elevation_angles = {
-                        "A": base_azimuth,
-                        "B": (base_azimuth + 90.0) % 360,
-                        "C": (base_azimuth + 180.0) % 360,
-                        "D": (base_azimuth + 270.0) % 360
-                    }
-                    if elevation not in elevation_angles:
-                        logger.warning(f"Invalid elevation '{elevation}' for {component_name}. Using default azimuth=0.")
-                        surface_azimuth = 0.0
-                    else:
-                        surface_azimuth = (elevation_angles[elevation] + component.get('rotation', 0.0)) % 360
-                        logger.debug(f"Component {component_name}: elevation={elevation}, base_azimuth={elevation_angles[elevation]}, rotation={component.get('rotation', 0.0)}, total_azimuth={surface_azimuth}")
-
-            if component_type in [ComponentType.WALL, ComponentType.ROOF]:
-                construction_name = component.get('construction', None)
-                if not construction_name:
-                    logger.warning(f"No construction defined for {component_name}. Using defaults: absorptivity=0.6, emissivity=0.9.")
-                else:
-                    construction_obj = (project_constructions.get(construction_name) or
-                                       material_library.library_constructions.get(construction_name))
-                    if not construction_obj:
-                        logger.warning(f"Construction '{construction_name}' not found for {component_name}. Using defaults: absorptivity=0.6, emissivity=0.9.")
-                    elif not construction_obj.get('layers', []):
-                        logger.warning(f"No layers in construction for {component_name}. Using defaults: absorptivity=0.6, emissivity=0.9.")
-                    else:
-                        first_layer = construction_obj['layers'][0]
-                        material_name = first_layer.get("material")
-                        if material_name:
-                            material_obj = (project_materials.get(material_name) or
-                                           material_library.library_materials.get(material_name))
-                            if material_obj:
-                                absorptivity = material_obj.get('absorptivity', 0.6)
-                                emissivity = material_obj.get('emissivity', 0.9)
-                                logger.debug(f"Using first layer material '{material_name}' for {component_name}: absorptivity={absorptivity}, emissivity={emissivity}")
-
-            elif component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                glazing_material_name = component.get('glazing_material', None)
+            # For windows and skylights, adjust h_o and use shgc instead of absorptivity
+            if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
+                glazing_material_name = component.get('fenestration', None)
                 if not glazing_material_name:
-                    logger.warning(f"No glazing material defined for {component_name}. Using default SHGC=0.7, h_o={h_o}.")
-                    shgc = 0.7
+                    logger.warning(f"No fenestration defined for {component_name}. Using default SHGC=0.7, h_o={h_o}.")
+                    absorptivity = component.get('shgc', 0.7)  # Use shgc as absorptivity for consistency
                 else:
                     glazing_material_obj = (project_glazing_materials.get(glazing_material_name) or
                                            material_library.library_glazing_materials.get(glazing_material_name))
                     if not glazing_material_obj:
-                        logger.warning(f"Glazing material '{glazing_material_name}' not found for {component_name}. Using default SHGC=0.7, h_o={h_o}.")
-                        shgc = 0.7
+                        logger.warning(f"Fenestration '{glazing_material_name}' not found for {component_name}. Using default SHGC=0.7, h_o={h_o}.")
+                        absorptivity = component.get('shgc', 0.7)
                     else:
-                        shgc = glazing_material_obj.get('shgc', 0.7)
+                        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 glazing material '{glazing_material_name}' for {component_name}: shgc={shgc}, h_o={h_o}")
-                emissivity = None
+                        logger.debug(f"Using fenestration '{glazing_material_name}' for {component_name}: shgc={absorptivity}, h_o={h_o}")
+                emissivity = None  # Emissivity not used for fenestrations
+
+            logger.info(f"Surface parameters for {component_name}: tilt={surface_tilt:.1f}, azimuth={surface_azimuth:.1f}, h_o={h_o:.1f}, "
+                       f"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_name}: {str(e)}")
+            # Apply defaults on error
             if component_type == ComponentType.ROOF:
                 surface_tilt = 0.0
                 h_o = 23.0
@@ -290,11 +236,11 @@ class TFMCalculations:
                 absorptivity = 0.6
                 emissivity = 0.9
             else:  # WINDOW, SKYLIGHT
-                shgc = 0.7
+                absorptivity = 0.7
                 emissivity = None
 
-        logger.info(f"Final 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
+            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
     def calculate_solar_load(component: Dict[str, Any], hourly_data: Dict, hour: int, building_orientation: float, mode: str = "none") -> float: