Update app/hvac_loads.py

app/hvac_loads.py

@@ -711,7 +711,7 @@ class TFMCalculations:
         
         elif sim_type in ["Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"]:
             period_key = sim_type.lower().replace(" ", "_")
-            period = climate_data.get("typical_extreme_periods", {}).get(period_key, {})
+            period = climate_data.get("typical_extreme_periods", {}).get(period_key)
             if not period:
                 logger.warning(f"No data found for {sim_type} in typical_extreme_periods.")
                 return []
@@ -721,9 +721,15 @@ class TFMCalculations:
             end_day = period["end"]["day"]
             for data in hourly_data:
                 month, day = data["month"], data["day"]
-                if (month > start_month or (month == start_month and day >= start_day)) and \
-                   (month < end_month or (month == end_month and day <= end_day)):
-                    filtered_data.append(data)
+                # Handle year-end wrap-around
+                if start_month > end_month:
+                    if (month > start_month or (month == start_month and day >= start_day)) or \
+                       (month < end_month or (month == end_month and day <= end_day)):
+                        filtered_data.append(data)
+                else:
+                    if (month > start_month or (month == start_month and day >= start_day)) and \
+                       (month < end_month or (month == end_month and day <= end_day)):
+                        filtered_data.append(data)
         
         return filtered_data
 
@@ -752,7 +758,12 @@ class TFMCalculations:
     @staticmethod
     def calculate_tfm_loads(components: Dict, hourly_data: List[Dict], indoor_conditions: Dict, internal_loads: Dict, building_info: Dict, sim_period: Dict, hvac_settings: Dict) -> List[Dict]:
         """Calculate TFM loads for heating and cooling with user-defined filters and temperature threshold."""
-        filtered_data = TFMCalculations.filter_hourly_data(hourly_data, sim_period, building_info)
+        # Access climate_data for ground temperatures
+        climate_data = st.session_state.project_data["climate_data"]
+        ground_temperatures = climate_data.get("ground_temperatures", {})
+        logger.debug(f"Ground temperatures available: {ground_temperatures.keys()}")
+        
+        filtered_data = TFMCalculations.filter_hourly_data(hourly_data, sim_period, climate_data)
         temp_loads = []
         building_orientation = building_info.get("orientation_angle", 0.0)
         operating_periods = hvac_settings.get("operating_hours", [{"start": 8, "end": 18}])
@@ -779,6 +790,10 @@ class TFMCalculations:
             outdoor_temp = hour_data["dry_bulb"]
             month = hour_data["month"]
             day = hour_data["day"]
+            # For future enhancement: Retrieve ground temperature for the current month
+            ground_temp = ground_temperatures.get("0.5", [20.0]*12)[month-1] if ground_temperatures else 20.0
+            logger.debug(f"Ground temperature for month {month}: {ground_temp:.1f}°C")
+            
             indoor_cond = TFMCalculations.get_indoor_conditions(indoor_conditions, hour, outdoor_temp, month, day, adaptive_setpoints)
             indoor_temp = indoor_cond["temperature"]
             conduction_cooling = conduction_heating = solar = internal = ventilation_cooling = ventilation_heating = infiltration_cooling = infiltration_heating = 0
@@ -834,7 +849,8 @@ class TFMCalculations:
                 "infiltration_cooling": infiltration_cooling,
                 "infiltration_heating": infiltration_heating,
                 "total_cooling": total_cooling,
-                "total_heating": total_heating
+                "total_heating": total_heating,
+                "ground_temperature": ground_temp  # Included for future enhancement
             })
         loads_by_day = defaultdict(list)
         for load in temp_loads: