Update app/hvac_loads.py

app/hvac_loads.py

@@ -17,6 +17,7 @@ from collections import defaultdict
 import logging
 import math
 from utils.ctf_calculations import CTFCalculator, ComponentType, CTFCoefficients
+from utils.solar import SolarCalculations  # Import SolarCalculations for SHGC data
 
 # Configure logging
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')
@@ -67,32 +68,6 @@ class AdaptiveComfortModel:
         return setpoints
 
 class TFMCalculations:
-    # Solar calculation constants (from utils/solar.py)
-    SHGC_COEFFICIENTS = {
-        "Single Clear": [0.1, -0.0, 0.0, -0.0, 0.0, 0.87],
-        "Single Tinted": [0.12, -0.0, 0.0, -0.0, 0.8, -0.0],
-        "Double Clear": [0.14, -0.0, 0.0, -0.0, 0.78, -0.0],
-        "Double Low-E": [0.2, -0.0, 0.0, 0.7, 0.0, -0.0],
-        "Double Tinted": [0.15, -0.0, 0.0, -0.0, 0.65, -0.0],
-        "Double Low-E with Argon": [0.18, -0.0, 0.0, 0.68, 0.0, -0.0],
-        "Single Low-E Reflective": [0.22, -0.0, 0.0, 0.6, 0.0, -0.0],
-        "Double Reflective": [0.24, -0.0, 0.0, 0.58, 0.0, -0.0],
-        "Electrochromic": [0.25, -0.0, 0.5, -0.0, 0.0, -0.0]
-    }
-
-    GLAZING_TYPE_MAPPING = {
-        "Single Clear 3mm": "Single Clear",
-        "Single Clear 6mm": "Single Clear",
-        "Single Tinted 6mm": "Single Tinted",
-        "Double Clear 6mm/13mm Air": "Double Clear",
-        "Double Low-E 6mm/13mm Air": "Double Low-E",
-        "Double Tinted 6mm/13mm Air": "Double Tinted",
-        "Double Low-E 6mm/13mm Argon": "Double Low-E with Argon",
-        "Single Low-E Reflective 6mm": "Single Low-E Reflective",
-        "Double Reflective 6mm/13mm Air": "Double Reflective",
-        "Electrochromic 6mm/13mm Air": "Electrochromic"
-    }
-
     @staticmethod
     def get_component_type(component: Dict[str, Any]) -> ComponentType:
         """Map component dictionary 'type' to ComponentType enum."""
@@ -161,18 +136,6 @@ class TFMCalculations:
                        0.014615 * math.cos(2 * B_rad) - 0.04089 * math.sin(2 * B_rad))
         return EOT
 
-    @staticmethod
-    def calculate_dynamic_shgc(glazing_type: str, cos_theta: float) -> float:
-        """Calculate dynamic SHGC based on incidence angle."""
-        if glazing_type not in TFMCalculations.SHGC_COEFFICIENTS:
-            logger.warning(f"Unknown glazing type '{glazing_type}'. Using default SHGC coefficients for Single Clear.")
-            glazing_type = "Single Clear"
-        
-        c = TFMCalculations.SHGC_COEFFICIENTS[glazing_type]
-        f_cos_theta = (c[0] + c[1] * cos_theta + c[2] * cos_theta**2 +
-                       c[3] * cos_theta**3 + c[4] * cos_theta**4 + c[5] * cos_theta**5)
-        return f_cos_theta
-
     @staticmethod
     def get_surface_parameters(component: Dict[str, Any], building_info: Dict, material_library: MaterialLibrary, 
                              project_materials: Dict, project_constructions: Dict, 
@@ -192,20 +155,20 @@ class TFMCalculations:
         try:
             # 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:
+                fenestration_name = component.get('fenestration', None)
+                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(glazing_material_name) or
-                                           material_library.library_glazing_materials.get(glazing_material_name))
+                    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 '{glazing_material_name}' not found for {component_name}. Using default SHGC=0.7, h_o={h_o}.")
+                        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 '{glazing_material_name}' for {component_name}: shgc={absorptivity}, h_o={h_o}")
+                        logger.debug(f"Using fenestration '{fenestration_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}, "
@@ -257,7 +220,7 @@ class TFMCalculations:
         try:
             material_library = st.session_state.get("material_library")
             if not material_library:
-                from app.material_library import MaterialLibrary
+                from app.materials_library import MaterialLibrary
                 material_library = MaterialLibrary()
                 st.session_state.material_library = material_library
                 logger.info(f"Created new MaterialLibrary for {component_name}")
@@ -392,30 +355,27 @@ class TFMCalculations:
             solar_heat_gain = 0.0
             
             if component_type in [ComponentType.WINDOW, ComponentType.SKYLIGHT]:
-                shgc = 0.7
-                glazing_material_name = component.get('glazing_material', None)
-                if glazing_material_name:
-                    glazing_material_obj = (project_glazing_materials.get(glazing_material_name) or
-                                           material_library.library_glazing_materials.get(glazing_material_name))
+                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', 0.7)
+                        shgc = glazing_material_obj.get('shgc', shgc)
                         h_o = glazing_material_obj.get('h_o', h_o)
                     else:
-                        logger.warning(f"Glazing material '{glazing_material_name}' not found for {component_name}. Using default SHGC=0.7.")
-                
-                glazing_type = "Single Clear"
-                if component.get('name') in TFMCalculations.GLAZING_TYPE_MAPPING:
-                    glazing_type = TFMCalculations.GLAZING_TYPE_MAPPING[component.get('name')]
+                        logger.warning(f"Fenestration '{fenestration_name}' not found for {component_name}. Using default SHGC=0.7.")
                 
-                iac = component.get('iac', 1.0)
+                glazing_type = SolarCalculations.GLAZING_TYPE_MAPPING.get(component.get('name', ''), "Single Clear")
+                shading_coeff = component.get('shading_coefficient', 1.0)  # Aligned with components.py
                 
-                shgc_dynamic = shgc * TFMCalculations.calculate_dynamic_shgc(glazing_type, cos_theta)
+                shgc_dynamic = shgc * SolarCalculations.calculate_dynamic_shgc(glazing_type, cos_theta)
                 
-                solar_heat_gain = component.get('area', 0.0) * shgc_dynamic * I_t * iac / 1000
+                solar_heat_gain = component.get('area', 0.0) * shgc_dynamic * I_t * shading_coeff / 1000
                 
                 logger.info(f"Fenestration solar heat gain for {component_name} at {month}/{day}/{hour}: "
                             f"{solar_heat_gain:.4f} kW (area={component.get('area', 0.0)}, shgc_dynamic={shgc_dynamic:.4f}, "
-                            f"I_t={I_t:.2f}, iac={iac})")
+                            f"I_t={I_t:.2f}, shading_coeff={shading_coeff})")
             
             elif component_type in [ComponentType.WALL, ComponentType.ROOF]:
                 surface_resistance = 1/h_o
@@ -716,7 +676,7 @@ class TFMCalculations:
         area = building_info.get("floor_area", 100.0)
         
         if "material_library" not in st.session_state:
-            from app.material_library import MaterialLibrary
+            from app.materials_library import MaterialLibrary
             st.session_state.material_library = MaterialLibrary()
             logger.info("Initialized MaterialLibrary in session_state for solar calculations")
         
@@ -954,7 +914,7 @@ def display_hvac_loads_page():
             )
             st.session_state.project_data["sim_period"]["base_temp"] = base_temp
 
-        # Indoor Conditions Configuration (unchanged)
+        # Indoor Conditions Configuration
         st.subheader("Indoor Conditions")
         indoor_type = st.selectbox(
             "Indoor Conditions Type",
@@ -1017,7 +977,7 @@ def display_hvac_loads_page():
             )
             st.session_state.project_data["indoor_conditions"]["adaptive_acceptability"] = acceptability
 
-        # Calculate HVAC Loads (unchanged)
+        # Calculate HVAC Loads
         if st.button("Calculate HVAC Loads"):
             try:
                 components = st.session_state.project_data["components"]
@@ -1047,7 +1007,7 @@ def display_hvac_loads_page():
                         hvac_settings=hvac_settings
                     )
 
-                    # Update session state with results (unchanged)
+                    # Update session state with results
                     cooling_loads = [load for load in loads if load["total_cooling"] > 0]
                     heating_loads = [load for load in loads if load["total_heating"] > 0]
                     st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] = cooling_loads