Update app/hvac_loads.py

app/hvac_loads.py

@@ -115,17 +115,48 @@ class TFMCalculations:
         return component_type
 
     @staticmethod
-    def calculate_conduction_load(component: Dict[str, Any], outdoor_temp: float, indoor_temp: float, hour: int, mode: str = "none") -> tuple[float, float]:
+    def calculate_conduction_load(component: Dict[str, Any], outdoor_temp: float, indoor_temp: float, hour: int, month: int, mode: str = "none") -> tuple[float, float]:
         """Calculate conduction load for heating and cooling in kW based on mode."""
         if mode == "none":
             return 0, 0
+    
         component_name = component.get('name', 'unnamed_component')
+        component_type = TFMCalculations.get_component_type(component)
+    
+        # Validate adiabatic and ground_contact mutual exclusivity
+        if component.get('adiabatic', False) and component.get('ground_contact', False):
+            logger.warning(f"Component {component_name} has both adiabatic and ground_contact set to True. Treating as adiabatic, setting ground_contact to False.")
+            component['ground_contact'] = False
+    
+        # Skip for adiabatic components
+        if component.get('adiabatic', False):
+            logger.info(f"Skipping conduction load calculation for adiabatic component {component_name} at hour {hour}")
+            return 0, 0
+    
+        # Handle ground-contact surfaces
+        if component.get('ground_contact', False):
+            valid_types = [ComponentType.WALL, ComponentType.ROOF, ComponentType.FLOOR]
+            if component_type not in valid_types:
+                logger.warning(f"Invalid ground-contact component type '{component_type.value}' for {component_name}. Using outdoor temperature {outdoor_temp:.2f}°C.")
+            else:
+                # Retrieve ground temperature
+                climate_data = st.session_state.project_data.get("climate_data", {})
+                ground_temperatures = climate_data.get("ground_temperatures", {})
+                depth = "2"  # Default depth
+                default_temps = {"0.5": 20.0, "2": 18.0, "4": 16.0}
+                if depth not in ground_temperatures or not ground_temperatures[depth]:
+                    logger.warning(f"No ground temperature data for depth {depth} m for month {month}. Using default {default_temps[depth]}°C.")
+                    outdoor_temp = default_temps[depth]
+                else:
+                    outdoor_temp = ground_temperatures[depth][month-1] if len(ground_temperatures[depth]) >= month else default_temps[depth]
+                logger.info(f"Ground-contact component {component_name} at hour {hour}, month {month}: using ground temperature {outdoor_temp:.2f}°C")
+    
         delta_t = outdoor_temp - indoor_temp
         if mode == "cooling" and delta_t <= 0:
             return 0, 0
         if mode == "heating" and delta_t >= 0:
             return 0, 0
-
+    
         try:
             # Get CTF coefficients, preferring stored value
             ctf = component.get('ctf')
@@ -143,7 +174,7 @@ class TFMCalculations:
             heating_load = -load / 1000 if mode == "heating" else 0
             logger.info(f"Conduction load for {component_name} at hour {hour}: cooling={cooling_load:.3f} kW, heating={heating_load:.3f} kW")
             return cooling_load, heating_load
-
+    
         except Exception as e:
             logger.error(f"Error calculating conduction load for {component_name} at hour {hour}: {str(e)}")
             return 0, 0
@@ -234,12 +265,14 @@ class TFMCalculations:
         """Calculate solar load in kW (cooling only) using ASHRAE-compliant solar calculations."""
         if mode != "cooling":
             return 0
-            
+    
         component_type = TFMCalculations.get_component_type(component)
-        if component_type == ComponentType.FLOOR:
-            return 0
-
         component_name = component.get('name', 'unnamed_component')
+    
+        # Skip for floors, adiabatic, or ground-contact components
+        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")
@@ -862,7 +895,7 @@ class TFMCalculations:
             if is_operating and mode == "cooling":
                 for comp_list in components.values():
                     for comp in comp_list:
-                        cool_load, _ = TFMCalculations.calculate_conduction_load(comp, outdoor_temp, indoor_temp, hour, mode="cooling")
+                        cool_load, _ = TFMCalculations.calculate_conduction_load(comp, outdoor_temp, indoor_temp, hour, month, mode="cooling")
                         component_solar_load = TFMCalculations.calculate_solar_load(comp, hour_data, hour, building_orientation, mode="cooling")
                         orientation = classify_azimuth(comp.get("surface_azimuth", 0))
                         element = TFMCalculations.get_component_type(comp).name
@@ -872,14 +905,14 @@ class TFMCalculations:
                         conduction_cooling += cool_load
                         solar += component_solar_load
                         logger.info(f"Component {comp.get('name', 'Unknown')} ({TFMCalculations.get_component_type(comp).value}) solar load: {component_solar_load:.3f} kW, accumulated solar: {solar:.3f} kW")
-                
+                        
                 internal = TFMCalculations.calculate_internal_load(internal_loads, hour, max([p["end"] - p["start"] for p in operating_periods]), area)
                 ventilation_cooling, _ = TFMCalculations.calculate_ventilation_load(internal_loads, outdoor_temp, indoor_temp, area, building_info, hour, mode="cooling")
                 infiltration_cooling, _ = TFMCalculations.calculate_infiltration_load(internal_loads, outdoor_temp, indoor_temp, area, building_info, hour, mode="cooling")
             elif is_operating and mode == "heating":
                 for comp_list in components.values():
                     for comp in comp_list:
-                        _, heat_load = TFMCalculations.calculate_conduction_load(comp, outdoor_temp, indoor_temp, hour, mode="heating")
+                        _, heat_load = TFMCalculations.calculate_conduction_load(comp, outdoor_temp, indoor_temp, hour, month, mode="heating")
                         orientation = classify_azimuth(comp.get("surface_azimuth", 0))
                         element = TFMCalculations.get_component_type(comp).name
                         key = orientation if element in ["WALL", "WINDOW"] else element
@@ -1421,6 +1454,63 @@ def display_hvac_loads_page():
             st.success("Internal loads conditions saved successfully.")
             logger.info("Internal loads conditions updated in session state.")
 
+        # Ground Temperature Configuration
+        st.subheader("Ground Temperature Configuration")
+        has_ground_contact = any(
+            comp.get('ground_contact', False)
+            for comp_list in st.session_state.project_data["components"].values()
+            for comp in comp_list
+        )
+        if has_ground_contact:
+            st.markdown("Configure monthly ground temperatures for components in contact with the ground (e.g., floors, walls, roofs). Typical ranges are 10–20°C at 2 m depth (ASHRAE Fundamentals, Chapter 18).")
+            
+            depth_options = ["0.5", "2", "4"]
+            default_depth = "2"
+            selected_depth = st.selectbox(
+                "Ground Temperature Depth (m)",
+                options=depth_options,
+                index=depth_options.index(default_depth),
+                key="ground_temp_depth"
+            )
+            
+            climate_data = st.session_state.project_data.get("climate_data", {})
+            ground_temperatures = climate_data.get("ground_temperatures", {})
+            default_temps = {"0.5": [20.0]*12, "2": [18.0]*12, "4": [16.0]*12}
+            
+            if selected_depth not in ground_temperatures or not ground_temperatures[selected_depth]:
+                st.warning(f"No ground temperature data available for depth {selected_depth} m. Using default temperatures: {default_temps[selected_depth][0]}°C.")
+                monthly_temps = default_temps[selected_depth]
+            else:
+                monthly_temps = ground_temperatures[selected_depth]
+            
+            st.write("Enter monthly ground temperatures (°C):")
+            months = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
+            temp_inputs = []
+            cols = st.columns(12)
+            for i, month in enumerate(months):
+                with cols[i]:
+                    temp = st.number_input(
+                        month,
+                        min_value=-20.0,
+                        max_value=40.0,
+                        value=monthly_temps[i],
+                        step=0.1,
+                        key=f"ground_temp_{selected_depth}_{month}"
+                    )
+                    temp_inputs.append(temp)
+            
+            if st.button("Save Ground Temperatures"):
+                if len(temp_inputs) != 12:
+                    st.error("Please provide temperatures for all 12 months.")
+                elif any(not -20.0 <= t <= 40.0 for t in temp_inputs):
+                    st.error("All temperatures must be between -20°C and 40°C.")
+                else:
+                    st.session_state.project_data["climate_data"]["ground_temperatures"][selected_depth] = temp_inputs
+                    st.success(f"Ground temperatures for depth {selected_depth} m saved successfully.")
+                    logger.info(f"Ground temperatures for depth {selected_depth} m updated in session state")
+        else:
+            st.info("No ground-contact components detected. Ground temperature configuration is not required.")        
+        
         # Calculate HVAC Loads
         if st.button("Calculate HVAC Loads"):
             try: