Update data/climate_data.py

data/climate_data.py

@@ -4,7 +4,7 @@ Extracts climate data from EPW files and provides visualizations inspired by Cli
 
 Author: Dr Majed Abuseif
 Date: May 2025
-Version: 2.1.4
+Version: 2.1.5
 """
 
 from typing import Dict, List, Any, Optional
@@ -19,6 +19,11 @@ from io import StringIO
 import pvlib
 from datetime import datetime, timedelta
 import re
+import logging
+
+# Set up logging
+logging.basicConfig(level=logging.INFO)
+logger = logging.getLogger(__name__)
 
 # Define paths
 DATA_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -52,12 +57,6 @@ STYLE = """
 </style>
 """
 
-# Country code to full name mapping
-COUNTRY_MAP = {
-    "AUS": "Australia",
-    # Add other mappings as needed
-}
-
 @dataclass
 class ClimateLocation:
     """Class representing a climate location with ASHRAE 169 data derived from EPW files."""
@@ -81,9 +80,8 @@ class ClimateLocation:
     hourly_data: List[Dict]  # Hourly data for integration with main.py
     typical_extreme_periods: Dict[str, Dict]  # Typical/extreme periods (summer/winter)
     ground_temperatures: Dict[str, List[float]]  # Monthly ground temperatures by depth
-    design_conditions: Dict[str, Any]  # Design conditions from EPW header
     
-    def __init__(self, epw_file: pd.DataFrame, typical_extreme_periods: Dict, ground_temperatures: Dict, design_conditions: Dict, **kwargs):
+    def __init__(self, epw_file: pd.DataFrame, typical_extreme_periods: Dict, ground_temperatures: Dict, **kwargs):
         """Initialize ClimateLocation with EPW file data and header information."""
         self.id = kwargs.get("id")
         self.country = kwargs.get("country")
@@ -94,7 +92,6 @@ class ClimateLocation:
         self.elevation = kwargs.get("elevation")
         self.typical_extreme_periods = typical_extreme_periods
         self.ground_temperatures = ground_temperatures
-        self.design_conditions = design_conditions
         
         # Extract columns from EPW data
         months = pd.to_numeric(epw_file[1], errors='coerce').values
@@ -105,7 +102,12 @@ class ClimateLocation:
         pressure = pd.to_numeric(epw_file[9], errors='coerce').values
         global_radiation = pd.to_numeric(epw_file[13], errors='coerce').values
         wind_direction = pd.to_numeric(epw_file[20], errors='coerce').values
-        wind_speed = pd.to_numeric(epw_file[21], errors='coerce').values
+        wind_speed = pd.to_numeric(epw_file[21], errors='coerce')
+        
+        # Filter wind speed outliers and log high values
+        wind_speed = wind_speed[wind_speed <= 50]  # Remove extreme outliers
+        if (wind_speed > 15).any():
+            logger.warning(f"High wind speeds detected: {wind_speed[wind_speed > 15].tolist()}")
         
         # Calculate wet-bulb temperature
         wet_bulb = ClimateData.calculate_wet_bulb(dry_bulb, humidity)
@@ -129,6 +131,9 @@ class ClimateLocation:
         self.wind_speed = round(np.nanmean(wind_speed), 1)
         self.pressure = round(np.nanmean(pressure), 1)
         
+        # Log wind speed diagnostics
+        logger.info(f"Wind speed stats: min={wind_speed.min():.1f}, max={wind_speed.max():.1f}, mean={self.wind_speed:.1f}")
+        
         # Assign climate zone
         self.climate_zone = ClimateData.assign_climate_zone(self.heating_degree_days, self.cooling_degree_days, np.nanmean(humidity))
         
@@ -174,8 +179,7 @@ class ClimateLocation:
             "pressure": self.pressure,
             "hourly_data": self.hourly_data,
             "typical_extreme_periods": self.typical_extreme_periods,
-            "ground_temperatures": self.ground_temperatures,
-            "design_conditions": self.design_conditions
+            "ground_temperatures": self.ground_temperatures
         }
 
 class ClimateData:
@@ -251,7 +255,7 @@ class ClimateData:
         if data["summer_daily_range"] < 0:
             st.error("Validation failed: Negative summer daily range")
             return False
-        if not (0 <= data["wind_speed"] <= 20):
+        if not (0 <= data["wind_speed"] <= 30):  # Updated range to 0–30 m/s
             st.error(f"Validation failed: Wind speed {data['wind_speed']} outside range")
             return False
         if not (80000 <= data["pressure"] <= 110000):
@@ -283,7 +287,7 @@ class ClimateData:
             if not (0 <= record["global_horizontal_radiation"] <= 1200):
                 st.error(f"Validation failed: Global radiation {record['global_horizontal_radiation']} outside range")
                 return False
-            if not (0 <= record["wind_speed"] <= 20):
+            if not (0 <= record["wind_speed"] <= 30):  # Updated range to 0–30 m/s
                 st.error(f"Validation failed: Wind speed {record['wind_speed']} outside range")
                 return False
             if not (0 <= record["wind_direction"] <= 360):
@@ -309,17 +313,6 @@ class ClimateData:
                     st.error(f"Validation failed: Invalid ground temperatures for depth {depth}")
                     return False
         
-        # Validate design conditions (optional)
-        if "design_conditions" in data and data["design_conditions"]:
-            if not all(key in data["design_conditions"] for key in ["heating", "cooling", "extremes"]):
-                st.warning("Validation warning: Incomplete design conditions")
-            for section in ["heating", "cooling", "extremes"]:
-                if section in data["design_conditions"]:
-                    for key, value in data["design_conditions"][section].items():
-                        if isinstance(value, (int, float)) and not (-50 <= value <= 50):
-                            st.error(f"Validation failed: Invalid {section} design condition {key}: {value}")
-                            return False
-        
         return True
 
     @staticmethod
@@ -377,113 +370,16 @@ class ClimateData:
                 # Parse header
                 header = next(line for line in epw_lines if line.startswith("LOCATION"))
                 header_parts = header.split(",")
-                city = header_parts[1].strip()
-                state_province = header_parts[2].strip() or "N/A"
-                country = header_parts[3].strip()
-                
-                # Override with session_state["building_info"] if available
-                building_info = session_state.get("building_info", {})
-                country = building_info.get("country", COUNTRY_MAP.get(country, country)) or "Unknown"
-                city = building_info.get("city", re.sub(r'\..*', '', city)) or "Unknown"
+                city = header_parts[1].strip() or "Unknown"
+                # Clean city name by removing suffixes like '.Racecourse'
+                city = re.sub(r'\..*', '', city)
+                state_province = header_parts[2].strip() or "Unknown"
+                country = header_parts[3].strip() or "Unknown"
                 
                 latitude = float(header_parts[6])
                 longitude = float(header_parts[7])
                 elevation = float(header_parts[8])
                 
-                # Parse DESIGN CONDITIONS
-                design_conditions = {"heating": {}, "cooling": {}, "extremes": {}}
-                for line in epw_lines:
-                    if line.startswith("DESIGN CONDITIONS"):
-                        parts = line.strip().split(',')
-                        if len(parts) < 41:
-                            st.warning(f"DESIGN CONDITIONS has {len(parts)} fields, expected 41. Using partial data.")
-                            break
-                        try:
-                            # Heating section
-                            if parts[3] and self.is_numeric(parts[3]):
-                                design_conditions["heating"]["coldest_month"] = int(parts[3])
-                            if parts[4] and self.is_numeric(parts[4]):
-                                design_conditions["heating"]["dry_bulb"] = float(parts[4])
-                            else:
-                                st.warning(f"Invalid heating dry_bulb: '{parts[4]}'")
-                            if parts[5] and self.is_numeric(parts[5]):
-                                design_conditions["heating"]["mean_coincident_db"] = float(parts[5])
-                            if parts[6] and self.is_numeric(parts[6]):
-                                design_conditions["heating"]["humidification_db"] = float(parts[6])
-                            if parts[7] and self.is_numeric(parts[7]):
-                                design_conditions["heating"]["mean_coincident_wb"] = float(parts[7])
-                            if parts[8] and self.is_numeric(parts[8]):
-                                design_conditions["heating"]["wind_speed_1"] = float(parts[8])
-                            if parts[9] and self.is_numeric(parts[9]):
-                                design_conditions["heating"]["wind_direction_1"] = float(parts[9])
-                            if parts[10] and self.is_numeric(parts[10]):
-                                design_conditions["heating"]["wind_speed_2"] = float(parts[10])
-                            if parts[11] and self.is_numeric(parts[11]):
-                                design_conditions["heating"]["wind_direction_2"] = float(parts[11])
-                            # Cooling section
-                            if parts[12] and self.is_numeric(parts[12]):
-                                design_conditions["cooling"]["hottest_month"] = int(parts[12])
-                            if parts[13] and self.is_numeric(parts[13]):
-                                design_conditions["cooling"]["dry_bulb_0_4"] = float(parts[13])
-                            if parts[14] and self.is_numeric(parts[14]):
-                                design_conditions["cooling"]["mean_coincident_wb_0_4"] = float(parts[14])
-                            if parts[15] and self.is_numeric(parts[15]):
-                                design_conditions["cooling"]["wet_bulb_0_4"] = float(parts[15])
-                            if parts[16] and self.is_numeric(parts[16]):
-                                design_conditions["cooling"]["mean_coincident_db_0_4"] = float(parts[16])
-                            if parts[17] and self.is_numeric(parts[17]):
-                                design_conditions["cooling"]["dry_bulb_1_0"] = float(parts[17])
-                            if parts[18] and self.is_numeric(parts[18]):
-                                design_conditions["cooling"]["mean_coincident_wb_1_0"] = float(parts[18])
-                            if parts[19] and self.is_numeric(parts[19]):
-                                design_conditions["cooling"]["wet_bulb_1_0"] = float(parts[19])
-                            if parts[20] and self.is_numeric(parts[20]):
-                                design_conditions["cooling"]["mean_coincident_db_1_0"] = float(parts[20])
-                            if parts[21] and self.is_numeric(parts[21]):
-                                design_conditions["cooling"]["dry_bulb_2_0"] = float(parts[21])
-                            if parts[22] and self.is_numeric(parts[22]):
-                                design_conditions["cooling"]["mean_coincident_wb_2_0"] = float(parts[22])
-                            if parts[23] and self.is_numeric(parts[23]):
-                                design_conditions["cooling"]["wet_bulb_2_0"] = float(parts[23])
-                            if parts[24] and self.is_numeric(parts[24]):
-                                design_conditions["cooling"]["mean_coincident_db_2_0"] = float(parts[24])
-                            if parts[25] and self.is_numeric(parts[25]):
-                                design_conditions["cooling"]["evaporation_wb_0_4"] = float(parts[25])
-                            if parts[26] and self.is_numeric(parts[26]):
-                                design_conditions["cooling"]["mean_coincident_db_wb_0_4"] = float(parts[26])
-                            # Extremes section
-                            if parts[27] and self.is_numeric(parts[27]):
-                                design_conditions["extremes"]["annual_max_db"] = float(parts[27])
-                            if parts[28] and self.is_numeric(parts[28]):
-                                design_conditions["extremes"]["mean_db"] = float(parts[28])
-                            if parts[29] and self.is_numeric(parts[29]):
-                                design_conditions["extremes"]["std_dev_db"] = float(parts[29])
-                            if parts[30] and self.is_numeric(parts[30]):
-                                design_conditions["extremes"]["min_db"] = float(parts[30])
-                            if parts[31] and self.is_numeric(parts[31]):
-                                design_conditions["extremes"]["max_db_1"] = float(parts[31])
-                            if parts[32] and self.is_numeric(parts[32]):
-                                design_conditions["extremes"]["min_db_1"] = float(parts[32])
-                            if parts[33] and self.is_numeric(parts[33]):
-                                design_conditions["extremes"]["max_db_2"] = float(parts[33])
-                            if parts[34] and self.is_numeric(parts[34]):
-                                design_conditions["extremes"]["min_db_2"] = float(parts[34])
-                            if parts[35] and self.is_numeric(parts[35]):
-                                design_conditions["extremes"]["max_db_3"] = float(parts[35])
-                            if parts[36] and self.is_numeric(parts[36]):
-                                design_conditions["extremes"]["min_db_3"] = float(parts[36])
-                            if parts[37] and self.is_numeric(parts[37]):
-                                design_conditions["extremes"]["max_db_4"] = float(parts[37])
-                            if parts[38] and self.is_numeric(parts[38]):
-                                design_conditions["extremes"]["min_db_4"] = float(parts[38])
-                            if parts[39] and self.is_numeric(parts[39]):
-                                design_conditions["extremes"]["max_db_5"] = float(parts[39])
-                            if parts[40] and self.is_numeric(parts[40]):
-                                design_conditions["extremes"]["min_db_5"] = float(parts[40])
-                        except Exception as e:
-                            st.warning(f"Error parsing DESIGN CONDITIONS field: {str(e)}. Continuing with partial data.")
-                        break
-                
                 # Parse TYPICAL/EXTREME PERIODS
                 typical_extreme_periods = {}
                 date_pattern = r'^\d{1,2}\s*/\s*\d{1,2}$'
@@ -575,7 +471,6 @@ class ClimateData:
                     epw_file=epw_data,
                     typical_extreme_periods=typical_extreme_periods,
                     ground_temperatures=ground_temperatures,
-                    design_conditions=design_conditions,
                     id=f"{country[:1].upper()}{city[:3].upper()}",
                     country=country,
                     state_province=state_province,
@@ -617,7 +512,6 @@ class ClimateData:
                 epw_file=epw_data,
                 typical_extreme_periods=climate_data_dict["typical_extreme_periods"],
                 ground_temperatures=climate_data_dict["ground_temperatures"],
-                design_conditions=climate_data_dict["design_conditions"],
                 id=climate_data_dict["id"],
                 country=climate_data_dict["country"],
                 state_province=climate_data_dict["state_province"],
@@ -696,48 +590,6 @@ class ClimateData:
         </div>
         """, unsafe_allow_html=True)
         
-        # EPW Header Design Conditions
-        if location.design_conditions and any(location.design_conditions[section] for section in ["heating", "cooling", "extremes"]):
-            heating_items = [
-                f"<li><strong>Coldest Month:</strong> {location.design_conditions['heating'].get('coldest_month', 'N/A')}</li>",
-                f"<li><strong>Dry-Bulb Temp:</strong> {location.design_conditions['heating'].get('dry_bulb', 'N/A')} °C</li>",
-                f"<li><strong>Mean Coincident Dry-Bulb:</strong> {location.design_conditions['heating'].get('mean_coincident_db', 'N/A')} °C</li>",
-                f"<li><strong>Humidification Dry-Bulb:</strong> {location.design_conditions['heating'].get('humidification_db', 'N/A')} °C</li>",
-                f"<li><strong>Mean Coincident Wet-Bulb:</strong> {location.design_conditions['heating'].get('mean_coincident_wb', 'N/A')} °C</li>"
-            ]
-            cooling_items = [
-                f"<li><strong>Hottest Month:</strong> {location.design_conditions['cooling'].get('hottest_month', 'N/A')}</li>",
-                f"<li><strong>Dry-Bulb Temp (0.4%):</strong> {location.design_conditions['cooling'].get('dry_bulb_0_4', 'N/A')} °C</li>",
-                f"<li><strong>Wet-Bulb Temp (0.4%):</strong> {location.design_conditions['cooling'].get('wet_bulb_0_4', 'N/A')} °C</li>",
-                f"<li><strong>Mean Coincident Wet-Bulb (0.4%):</strong> {location.design_conditions['cooling'].get('mean_coincident_wb_0_4', 'N/A')} °C</li>"
-            ]
-            extremes_items = [
-                f"<li><strong>Annual Max Dry-Bulb:</strong> {location.design_conditions['extremes'].get('annual_max_db', 'N/A')} °C</li>",
-                f"<li><strong>Annual Min Dry-Bulb:</strong> {location.design_conditions['extremes'].get('min_db', 'N/A')} °C</li>"
-            ]
-            st.markdown(f"""
-            <div class="markdown-text">
-                <h3>Design Conditions (EPW Header)</h3>
-                <ul>
-                    <li><strong>Heating:</strong>
-                        <ul>
-                            {''.join(heating_items)}
-                        </ul>
-                    </li>
-                    <li><strong>Cooling:</strong>
-                        <ul>
-                            {''.join(cooling_items)}
-                        </ul>
-                    </li>
-                    <li><strong>Extremes:</strong>
-                        <ul>
-                            {''.join(extremes_items)}
-                        </ul>
-                    </li>
-                </ul>
-            </div>
-            """, unsafe_allow_html=True)
-        
         # Typical/Extreme Periods
         if location.typical_extreme_periods:
             period_items = [
@@ -1080,7 +932,6 @@ class ClimateData:
                 epw_file=epw_data,
                 typical_extreme_periods=loc_dict["typical_extreme_periods"],
                 ground_temperatures=loc_dict["ground_temperatures"],
-                design_conditions=loc_dict["design_conditions"],
                 id=loc_dict["id"],
                 country=loc_dict["country"],
                 state_province=loc_dict["state_province"],