Update app/hvac_loads.py

app/hvac_loads.py

@@ -273,7 +273,7 @@ class TFMCalculations:
         if component_type == ComponentType.FLOOR or component.get('adiabatic', False) or component.get('ground_contact', False):
             logger.info(f"Skipping solar load calculation for {component_name} at hour {hour} (type={component_type.value}, adiabatic={component.get('adiabatic', False)}, ground_contact={component.get('ground_contact', False)})")
             return 0
-
+    
         try:
             material_library = st.session_state.get("material_library")
             if not material_library:
@@ -281,7 +281,7 @@ class TFMCalculations:
                 material_library = MaterialLibrary()
                 st.session_state.material_library = material_library
                 logger.info(f"Created new MaterialLibrary for {component_name}")
-
+    
             project_materials = st.session_state.get("project_data", {}).get("materials", {}).get("project", {})
             project_constructions = st.session_state.get("project_data", {}).get("constructions", {}).get("project", {})
             project_glazing_materials = st.session_state.get("project_data", {}).get("fenestrations", {}).get("project", {})
@@ -290,7 +290,7 @@ class TFMCalculations:
             longitude = climate_data.get("longitude", 0.0)
             timezone = climate_data.get("time_zone", 0.0)
             ground_reflectivity = climate_data.get("ground_reflectivity", 0.2)
-
+    
             if not -90 <= latitude <= 90:
                 logger.warning(f"Invalid latitude {latitude} for {component_name}. Using default 0.0.")
                 latitude = 0.0
@@ -303,17 +303,17 @@ class TFMCalculations:
             if not 0 <= ground_reflectivity <= 1:
                 logger.warning(f"Invalid ground_reflectivity {ground_reflectivity} for {component_name}. Using default 0.2.")
                 ground_reflectivity = 0.2
-
+    
             required_fields = ["month", "day", "hour", "global_horizontal_radiation", "direct_normal_radiation", 
                              "diffuse_horizontal_radiation", "dry_bulb"]
             if not all(field in hourly_data for field in required_fields):
                 logger.warning(f"Missing required fields in hourly_data for hour {hour} for {component_name}: {hourly_data}")
                 return 0
-
+    
             if hourly_data["global_horizontal_radiation"] <= 0:
                 logger.info(f"No solar load for hour {hour} due to GHI={hourly_data['global_horizontal_radiation']} for {component_name}")
                 return 0
-
+    
             month = hourly_data["month"]
             day = hourly_data["day"]
             hour = hourly_data["hour"]
@@ -321,30 +321,30 @@ class TFMCalculations:
             dni = hourly_data.get("direct_normal_radiation", ghi * 0.7)
             dhi = hourly_data.get("diffuse_horizontal_radiation", ghi * 0.3)
             outdoor_temp = hourly_data["dry_bulb"]
-
+    
             if ghi < 0 or dni < 0 or dhi < 0:
                 logger.error(f"Negative radiation values for {month}/{day}/{hour} for {component_name}")
                 raise ValueError(f"Negative radiation values for {month}/{day}/{hour}")
-
+    
             logger.info(f"Processing solar for {month}/{day}/{hour} with GHI={ghi}, DNI={dni}, DHI={dhi}, "
                        f"dry_bulb={outdoor_temp} for {component_name}")
-
+    
             year = 2025
             n = TFMCalculations.day_of_year(month, day, year)
             EOT = TFMCalculations.equation_of_time(n)
             lambda_std = 15 * timezone
             standard_time = hour - 1 + 0.5
             LST = standard_time + (4 * (lambda_std - longitude) + EOT) / 60 
-
+    
             delta = 23.45 * math.sin(math.radians(360 / 365 * (284 + n)))
             phi = math.radians(latitude)
             delta_rad = math.radians(delta)
             hra = 15 * (LST - 12)
             hra_rad = math.radians(hra)
-
+    
             sin_alpha = math.sin(phi) * math.sin(delta_rad) + math.cos(phi) * math.cos(delta_rad) * math.cos(hra_rad)
             alpha = math.degrees(math.asin(sin_alpha))
-
+    
             if abs(math.cos(math.radians(alpha))) < 0.01:
                 azimuth = 0
             else:
@@ -353,10 +353,10 @@ class TFMCalculations:
                 azimuth = math.degrees(math.atan2(sin_az, cos_az))
                 if hra > 0:
                     azimuth = 360 - azimuth if azimuth > 0 else -azimuth
-
+    
             logger.info(f"Solar angles for {month}/{day}/{hour}: declination={delta:.2f}, LST={LST:.2f}, "
                        f"HRA={hra:.2f}, altitude={alpha:.2f}, azimuth={azimuth:.2f} for {component_name}")
-
+    
             building_info = {"orientation_angle": building_orientation}
             try:
                 surface_tilt, surface_azimuth, h_o, emissivity, absorptivity = \
@@ -385,7 +385,7 @@ class TFMCalculations:
                 else:  # WINDOW, SKYLIGHT
                     absorptivity = 0.0
                     h_o = DEFAULT_WINDOW_PROPERTIES["h_o"]
-
+    
             alpha_rad = math.radians(alpha)
             surface_tilt_rad = math.radians(surface_tilt)
             azimuth_rad = math.radians(azimuth)
@@ -400,7 +400,7 @@ class TFMCalculations:
             logger.info(f"  Component {component_name} at {month}/{day}/{hour}: "
                         f"surface_tilt={surface_tilt:.2f}, surface_azimuth={surface_azimuth:.2f}, "
                         f"cos_theta={cos_theta:.4f}")
-
+    
             view_factor = (1 - math.cos(surface_tilt_rad)) / 2
             ground_reflected = ground_reflectivity * ghi * view_factor
             
@@ -415,14 +415,20 @@ class TFMCalculations:
                 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
-                
+                # Adjust shading coefficient based on shading type
+                shading_type = component.get('shading_type', 'No shading')
+                if shading_type == "External Shading":
+                    shading_coeff *= 0.6
+                elif shading_type == "Internal Shading":
+                    shading_coeff *= 0.8
+                    
                 shgc_dynamic = shgc * SolarCalculations.calculate_dynamic_shgc(glazing_type, cos_theta)
                 
                 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}, shading_coeff={shading_coeff})")
+                            f"I_t={I_t:.2f}, shading_coeff={shading_coeff}, shading_type={shading_type})")
             
             elif component_type in [ComponentType.WALL, ComponentType.ROOF]:
                 surface_resistance = 1/h_o
@@ -434,7 +440,7 @@ class TFMCalculations:
                             f"I_t={I_t:.2f}, surface_resistance={surface_resistance:.4f})")
             
             return solar_heat_gain
-
+    
         except Exception as e:
             logger.error(f"Error calculating solar load for {component_name} at hour {hour}: {str(e)}")
             return 0