Update utils/solar.py

utils/solar.py

@@ -354,6 +354,11 @@ class SolarCalculations:
                     continue
                 for comp in comp_list:
                     try:
+                        # Validate adiabatic and ground_contact mutual exclusivity
+                        if comp.get('adiabatic', False) and comp.get('ground_contact', False):
+                            logger.warning(f"Component {comp.get('name', 'unknown_component')} has both adiabatic and ground_contact set to True. Treating as adiabatic, setting ground_contact to False.")
+                            comp['ground_contact'] = False
+        
                         # Get surface parameters
                         surface_tilt, surface_azimuth, h_o, emissivity, absorptivity = \
                             self.get_surface_parameters(comp, building_info)
@@ -361,22 +366,22 @@ class SolarCalculations:
                         # For windows/skylights, get SHGC from component
                         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)) +
                                      math.cos(math.radians(alpha)) * math.sin(math.radians(surface_tilt)) *
                                      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('name', 'unknown_component')} at {month}/{day}/{hour}: "
                                    f"surface_tilt={surface_tilt:.2f}, surface_azimuth={surface_azimuth:.2f}, "
                                    f"cos_theta={cos_theta:.2f}, h_o={h_o:.2f}")
-
+        
                         # Calculate total incident radiation (I_t)
                         view_factor = (1 - math.cos(math.radians(surface_tilt))) / 2
                         ground_reflected = ground_reflectivity * ghi * view_factor
                         I_t = dni * cos_theta + dhi + ground_reflected
-
+        
                         # Initialize result
                         comp_result = {
                             "component_id": comp.get('name', 'unknown_component'),
@@ -384,17 +389,46 @@ class SolarCalculations:
                             "absorptivity": round(absorptivity, 2),
                             "emissivity": round(emissivity, 2) if emissivity is not None else None
                         }
-
-                        # Calculate sol-air temperature for opaque surfaces
-                        ifsentence = comp.get('type', '').lower() in ['walls', 'roofs']
-                        if ifsentence:
+        
+                        # Skip calculations for adiabatic surfaces
+                        if comp.get('adiabatic', False):
+                            logger.info(f"Skipping solar calculations for adiabatic component {comp_result['component_id']} at {month}/{day}/{hour}")
+                            component_results.append(comp_result)
+                            continue
+        
+                        # Handle ground-contact surfaces
+                        if comp.get('ground_contact', False):
+                            # Validate component type
+                            component_type = comp.get('type', '').lower()
+                            valid_types = ['walls', 'roofs', 'floors']
+                            if component_type not in valid_types:
+                                logger.warning(f"Invalid ground-contact component type '{component_type}' for {comp_result['component_id']}. Skipping ground temperature assignment.")
+                                component_results.append(comp_result)
+                                continue
+        
+                            # Retrieve ground temperature
+                            climate_data = st.session_state.project_data.get("climate_data", {})
+                            ground_temperatures = climate_data.get("ground_temperatures", {})
+                            depth = "2"  # Default depth
+                            if depth not in ground_temperatures or not ground_temperatures[depth]:
+                                logger.warning(f"No ground temperature data for depth {depth} m for {month}/{day}/{hour}. Using default 18°C.")
+                                ground_temp = 18.0
+                            else:
+                                ground_temp = ground_temperatures[depth][month-1] if len(ground_temperatures[depth]) >= month else 18.0
+                            comp_result["ground_temp"] = round(ground_temp, 2)
+                            logger.info(f"Ground-contact component {comp_result['component_id']} at {month}/{day}/{hour}: ground_temp={ground_temp:.2f}°C")
+                            component_results.append(comp_result)
+                            continue
+        
+                        # Calculate sol-air temperature for opaque surfaces (non-ground-contact)
+                        if comp.get('type', '').lower() in ['walls', 'roofs'] and not comp.get('ground_contact', False):
                             T_sol_air = CTFCalculator.calculate_sol_air_temperature(
                                 outdoor_temp, I_t, absorptivity, emissivity or 0.9,
                                 h_o, dew_point, total_sky_cover
                             )
                             comp_result["sol_air_temp"] = round(T_sol_air, 2)
                             logger.info(f"Sol-air temp for {comp_result['component_id']} at {month}/{day}/{hour}: {T_sol_air:.2f}°C")
-
+        
                         # Calculate solar heat gain for fenestration
                         elif comp.get('type', '').lower() in ['windows', 'skylights']:
                             glazing_type = self.GLAZING_TYPE_MAPPING.get(comp.get('fenestration', ''), 'Single Clear')
@@ -408,7 +442,7 @@ class SolarCalculations:
                                        f"I_t={I_t:.2f}, iac={iac})")
                         
                         component_results.append(comp_result)
-
+        
                     except Exception as e:
                         component_name = comp.get('name', 'unknown_component')
                         logger.error(f"Error processing component {component_name} at {month}/{day}/{hour}: {str(e)}")