Update app/hvac_loads.py

app/hvac_loads.py

@@ -149,7 +149,8 @@ class TFMCalculations:
         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
+        h_o = DEFAULT_WINDOW_PROPERTIES["h_o"] if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT] else \
+              17.0 if component_type in [ComponentType.WALL, 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)
         
@@ -157,19 +158,13 @@ class TFMCalculations:
             # For windows and skylights, adjust h_o and use shgc instead of absorptivity
             if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
                 fenestration_name = component.get('fenestration', None)
+                h_o = component.get('h_o', DEFAULT_WINDOW_PROPERTIES["h_o"])  # Use component-stored h_o
                 if not fenestration_name:
                     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(fenestration_name) or
-                                           material_library.library_glazing_materials.get(fenestration_name))
-                    if not glazing_material_obj:
-                        logger.warning(f"Fenestration '{fenestration_name}' not found for {component_name}. 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_name}: shgc={absorptivity}, h_o={h_o}")
+                    absorptivity = component.get('shgc', 0.7)  # Use component-stored shgc
+                    logger.debug(f"Using component-stored SHGC 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}, "
@@ -185,7 +180,7 @@ class TFMCalculations:
                 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
@@ -193,7 +188,7 @@ class TFMCalculations:
                 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]:
@@ -328,7 +323,7 @@ class TFMCalculations:
                     h_o = 17.0 if component_type == ComponentType.WALL else 23.0
                 else:  # WINDOW, SKYLIGHT
                     absorptivity = 0.0
-                    h_o = 17.0 if component_type == ComponentType.WINDOW else 23.0
+                    h_o = DEFAULT_WINDOW_PROPERTIES["h_o"]
 
             alpha_rad = math.radians(alpha)
             surface_tilt_rad = math.radians(surface_tilt)
@@ -356,18 +351,8 @@ class TFMCalculations:
             solar_heat_gain = 0.0
             
             if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                shgc = component.get('shgc', 0.7)
-                fenestration_name = component.get('fenestration', None)
-                if fenestration_name:
-                    glazing_material_obj = (project_glazing_materials.get(fenestration_name) or
-                                           material_library.library_glazing_materials.get(fenestration_name))
-                    if glazing_material_obj:
-                        shgc = glazing_material_obj.get('shgc', shgc)
-                        h_o = glazing_material_obj.get('h_o', h_o)
-                    else:
-                        logger.warning(f"Fenestration '{fenestration_name}' not found for {component_name}. Using default SHGC=0.7.")
-                
-                glazing_type = SolarCalculations.GLAZING_TYPE_MAPPING.get(component.get('name', ''), "Single Clear")
+                shgc = component.get('shgc', 0.7)  # Use component-stored shgc
+                glazing_type = SolarCalculations.GLAZING_TYPE_MAPPING.get(component.get('fenestration', ''), "Single Clear")
                 shading_coeff = component.get('shading_coefficient', 1.0)  # Aligned with components.py
                 
                 shgc_dynamic = shgc * SolarCalculations.calculate_dynamic_shgc(glazing_type, cos_theta)
@@ -680,7 +665,7 @@ class TFMCalculations:
             from app.materials_library import MaterialLibrary
             st.session_state.material_library = MaterialLibrary()
             logger.info("Initialized MaterialLibrary in session_state for solar calculations")
-        
+
         if indoor_conditions["type"] == "ASHRAE 55 Adaptive Comfort":
             acceptability = indoor_conditions.get("adaptive_acceptability", "90")
             adaptive_setpoints = AdaptiveComfortModel.generate_adaptive_setpoints(hourly_data, acceptability)