Update data/climate_data.py

data/climate_data.py

@@ -1,172 +1,4 @@
-"""
-ASHRAE 169 climate data module for HVAC Load Calculator.
-This module provides access to climate data for various locations based on ASHRAE 169 standard.
-
-Author: Dr Majed Abuseif
-Date: March 2025
-Version: 1.0.0
-"""
-
-from typing import Dict, List, Any, Optional
-import pandas as pd
-import numpy as np
-import os
-import json
-from dataclasses import dataclass
-import streamlit as st
-import plotly.graph_objects as go
-from io import StringIO
-
-# Define paths
-DATA_DIR = os.path.dirname(os.path.abspath(__file__))
-
-
-@dataclass
-class ClimateLocation:
-    """Class representing a climate location with ASHRAE 169 data."""
-    
-    id: str
-    country: str
-    state_province: str
-    city: str
-    latitude: float
-    longitude: float
-    elevation: float  # meters
-    climate_zone: str
-    heating_degree_days: float  # base 18°C
-    cooling_degree_days: float  # base 18°C
-    winter_design_temp: float  # 99.6% heating design temperature (°C)
-    summer_design_temp_db: float  # 0.4% cooling design dry-bulb temperature (°C)
-    summer_design_temp_wb: float  # 0.4% cooling design wet-bulb temperature (°C)
-    summer_daily_range: float  # Mean daily temperature range in summer (°C)
-    monthly_temps: Dict[str, float]  # Average monthly temperatures (°C)
-    monthly_humidity: Dict[str, float]  # Average monthly relative humidity (%)
-    
-    def to_dict(self) -> Dict[str, Any]:
-        """Convert the climate location to a dictionary."""
-        return {
-            "id": self.id,
-            "country": self.country,
-            "state_province": self.state_province,
-            "city": self.city,
-            "latitude": self.latitude,
-            "longitude": self.longitude,
-            "elevation": self.elevation,
-            "climate_zone": self.climate_zone,
-            "heating_degree_days": self.heating_degree_days,
-            "cooling_degree_days": self.cooling_degree_days,
-            "winter_design_temp": self.winter_design_temp,
-            "summer_design_temp_db": self.summer_design_temp_db,
-            "summer_design_temp_wb": self.summer_design_temp_wb,
-            "summer_daily_range": self.summer_daily_range,
-            "monthly_temps": self.monthly_temps,
-            "monthly_humidity": self.monthly_humidity
-        }
-
-
-class ClimateData:
-    """Class for managing ASHRAE 169 climate data."""
-    
-    def __init__(self):
-        """Initialize climate data."""
-        self.locations = {}
-        self.countries = []
-        self.country_states = {}
-    
-    def _group_locations_by_country_state(self) -> Dict[str, Dict[str, List[str]]]:
-        """Group locations by country and state/province."""
-        result = {}
-        for loc in self.locations.values():
-            if loc.country not in result:
-                result[loc.country] = {}
-            if loc.state_province not in result[loc.country]:
-                result[loc.country][loc.state_province] = []
-            result[loc.country][loc.state_province].append(loc.city)
-        for country in result:
-            for state in result[country]:
-                result[country][state] = sorted(result[country][state])
-        return result
-    
-    def add_location(self, location: ClimateLocation):
-        """Add a new location to the dictionary."""
-        self.locations[location.id] = location
-        self.countries = sorted(list(set(loc.country for loc in self.locations.values())))
-        self.country_states = self._group_locations_by_country_state()
-
-    def display_climate_input(self, session_state: Dict[str, Any]):
-        """Display form for manual input or EPW upload in Streamlit."""
-        st.title("Climate Data")
-        
-        if not session_state.building_info.get("country") or not session_state.building_info.get("city"):
-            st.warning("Please enter country and city in Building Information first.")
-            st.button("Go to Building Information", on_click=lambda: setattr(session_state, "page", "Building Information"))
-            return
-        
-        st.subheader(f"Location: {session_state.building_info['country']}, {session_state.building_info['city']}")
-        tab1, tab2 = st.tabs(["Manual Input", "Upload EPW File"])
-        
-        # Manual Input Tab
-        with tab1:
-            with st.form("manual_climate_form"):
-                col1, col2 = st.columns(2)
-                with col1:
-                    id_input = st.text_input("Location ID", value=f"{session_state.building_info['country'][:2].upper()}-{session_state.building_info['city'][:3].upper()}")
-                    state_province = st.text_input("State/Province", value="N/A")
-                    latitude = st.number_input("Latitude", min_value=-90.0, max_value=90.0, value=0.0, step=0.1)
-                    longitude = st.number_input("Longitude", min_value=-180.0, max_value=180.0, value=0.0, step=0.1)
-                    elevation = st.number_input("Elevation (m)", min_value=0.0, value=0.0, step=10.0)
-                    climate_zone = st.selectbox("Climate Zone", ["0A", "0B", "1A", "1B", "2A", "2B", "3A", "3B", "3C", "4A", "4B", "4C", "5A", "5B", "5C", "6A", "6B", "7", "8"])
-                
-                with col2:
-                    hdd = st.number_input("Heating Degree Days (base 18°C)", min_value=0.0, value=0.0, step=100.0)
-                    cdd = st.number_input("Cooling Degree Days (base 18°C)", min_value=0.0, value=0.0, step=100.0)
-                    winter_design_temp = st.number_input("Winter Design Temp (99.6%) (°C)", min_value=-50.0, max_value=20.0, value=0.0, step=0.5)
-                    summer_design_temp_db = st.number_input("Summer Design Temp DB (0.4%) (°C)", min_value=0.0, max_value=50.0, value=35.0, step=0.5)
-                    summer_design_temp_wb = st.number_input("Summer Design Temp WB (0.4%) (°C)", min_value=0.0, max_value=40.0, value=25.0, step=0.5)
-                    summer_daily_range = st.number_input("Summer Daily Range (°C)", min_value=0.0, value=5.0, step=0.5)
-                
-                st.subheader("Monthly Data")
-                monthly_temps = {}
-                monthly_humidity = {}
-                month_names = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
-                col1, col2 = st.columns(2)
-                with col1:
-                    for month in month_names[:6]:
-                        monthly_temps[month] = st.number_input(f"{month} Temp (°C)", min_value=-50.0, max_value=50.0, value=20.0, step=0.5, key=f"temp_{month}")
-                with col2:
-                    for month in month_names[6:]:
-                        monthly_temps[month] = st.number_input(f"{month} Temp (°C)", min_value=-50.0, max_value=50.0, value=20.0, step=0.5, key=f"temp_{month}")
-                col1, col2 = st.columns(2)
-                with col1:
-                    for month in month_names[:6]:
-                        monthly_humidity[month] = st.number_input(f"{month} Humidity (%)", min_value=0.0, max_value=100.0, value=50.0, step=5.0, key=f"hum_{month}")
-                with col2:
-                    for month in month_names[6:]:
-                        monthly_humidity[month] = st.number_input(f"{month} Humidity (%)", min_value=0.0, max_value=100.0, value=50.0, step=5.0, key=f"hum_{month}")
-                
-                if st.form_submit_button("Save Climate Data"):
-                    location = ClimateLocation(
-                        id=id_input,
-                        country=session_state.building_info["country"],
-                        state_province=state_province,
-                        city=session_state.building_info["city"],
-                        latitude=latitude,
-                        longitude=longitude,
-                        elevation=elevation,
-                        climate_zone=climate_zone,
-                        heating_degree_days=hdd,
-                        cooling_degree_days=cdd,
-                        winter_design_temp=winter_design_temp,
-                        summer_design_temp_db=summer_design_temp_db,
-                        summer_design_temp_wb=summer_design_temp_wb,
-                        summer_daily_range=summer_daily_range,
-                        monthly_temps=monthly_temps,
-                        monthly_humidity=monthly_humidity
-                    )
-                    self.add_location(location)
-                    st.success("Climate data saved manually!")
-                    self.display_design_conditions(location)
-                    self.visualize_data(location, epw_data=None)
+# ... (Previous code unchanged up to the EPW Upload Tab) ...
 
         # EPW Upload Tab
         with tab2:
@@ -191,11 +23,11 @@ class ClimateData:
                     for col in epw_data.columns:
                         epw_data[col] = pd.to_numeric(epw_data[col], errors='coerce')
                     
-                    # Extract key columns (corrected humidity to column 21)
+                    # Extract key columns (using your specified indices: 7, 8, 9)
                     months = epw_data[1].values  # Month
-                    dry_bulb = epw_data[6].values  # Dry-bulb temperature (°C)
-                    wet_bulb = epw_data[8].values  # Wet-bulb temperature (°C)
-                    humidity = epw_data[21].values  # Relative humidity (%) - corrected from 9
+                    dry_bulb = epw_data[7].values  # Dry-bulb temperature (°C) - changed from 6 to 7
+                    wet_bulb = epw_data[8].values  # Wet-bulb temperature (°C) - unchanged
+                    humidity = epw_data[9].values  # Relative humidity (%) - changed from 21 to 9
                     
                     # Check for critical NaN issues
                     if np.all(np.isnan(dry_bulb)) or np.all(np.isnan(humidity)):
@@ -253,62 +85,7 @@ class ClimateData:
                 except Exception as e:
                     st.error(f"Error processing EPW file: {str(e)}. Ensure it has 8760 hourly records and correct format.")
 
-        # Navigation buttons
-        col1, col2 = st.columns(2)
-        with col1:
-            st.button("Back to Building Information", on_click=lambda: setattr(session_state, "page", "Building Information"))
-        with col2:
-            if self.locations:
-                st.button("Continue to Building Components", on_click=lambda: setattr(session_state, "page", "Building Components"))
-            else:
-                st.button("Continue to Building Components", disabled=True)
-
-    def display_design_conditions(self, location: ClimateLocation):
-        """Display a table of design conditions for calculations."""
-        st.subheader("Design Conditions for HVAC Calculations")
-        design_data = pd.DataFrame({
-            "Parameter": [
-                "Climate Zone",
-                "Heating Degree Days (base 18°C)",
-                "Cooling Degree Days (base 18°C)",
-                "Winter Design Temperature (99.6%)",
-                "Summer Design Dry-Bulb Temp (0.4%)",
-                "Summer Design Wet-Bulb Temp (0.4%)",
-                "Summer Daily Temperature Range"
-            ],
-            "Value": [
-                location.climate_zone,
-                f"{location.heating_degree_days} HDD",
-                f"{location.cooling_degree_days} CDD",
-                f"{location.winter_design_temp} °C",
-                f"{location.summer_design_temp_db} °C",
-                f"{location.summer_design_temp_wb} °C",
-                f"{location.summer_daily_range} °C"
-            ]
-        })
-        st.table(design_data)
-
-    @staticmethod
-    def assign_climate_zone(hdd: float, cdd: float, avg_humidity: float) -> str:
-        """Assign ASHRAE 169 climate zone based on HDD, CDD, and humidity."""
-        if cdd > 10000:
-            return "0A" if avg_humidity > 60 else "0B"
-        elif cdd > 5000:
-            return "1A" if avg_humidity > 60 else "1B"
-        elif cdd > 2500:
-            return "2A" if avg_humidity > 60 else "2B"
-        elif hdd < 2000 and cdd > 1000:
-            return "3A" if avg_humidity > 60 else "3B" if avg_humidity < 40 else "3C"
-        elif hdd < 3000:
-            return "4A" if avg_humidity > 60 else "4B" if avg_humidity < 40 else "4C"
-        elif hdd < 4000:
-            return "5A" if avg_humidity > 60 else "5B" if avg_humidity < 40 else "5C"
-        elif hdd < 5000:
-            return "6A" if avg_humidity > 60 else "6B"
-        elif hdd < 7000:
-            return "7"
-        else:
-            return "8"
+# ... (Rest of the code unchanged up to visualize_data) ...
 
     @staticmethod
     def visualize_data(location: ClimateLocation, epw_data: Optional[pd.DataFrame] = None):
@@ -333,7 +110,7 @@ class ClimateData:
         
         # Add min/max for EPW data only
         if epw_data is not None:
-            dry_bulb = epw_data[6].values
+            dry_bulb = epw_data[7].values  # Changed from 6 to 7
             month_col = epw_data[1].values
             temps_min = []
             temps_max = []
@@ -382,7 +159,7 @@ class ClimateData:
         
         # Add min/max for EPW data only
         if epw_data is not None:
-            humidity = epw_data[21].values
+            humidity = epw_data[9].values  # Changed from 21 to 9
             humidity_min = []
             humidity_max = []
             for i in range(1, 13):
@@ -417,31 +194,4 @@ class ClimateData:
         )
         st.plotly_chart(fig_hum, use_container_width=True)
 
-    def export_to_json(self, file_path: str) -> None:
-        """Export all climate data to a JSON file."""
-        data = {loc_id: loc.to_dict() for loc_id, loc in self.locations.items()}
-        with open(file_path, 'w') as f:
-            json.dump(data, f, indent=4)
-
-    @classmethod
-    def from_json(cls, file_path: str) -> 'ClimateData':
-        """Create a ClimateData instance from a JSON file."""
-        with open(file_path, 'r') as f:
-            data = json.load(f)
-        climate_data = cls()
-        climate_data.locations = {}
-        for loc_id, loc_dict in data.items():
-            climate_data.locations[loc_id] = ClimateLocation(**loc_dict)
-        climate_data.countries = sorted(list(set(loc.country for loc in climate_data.locations.values())))
-        climate_data.country_states = climate_data._group_locations_by_country_state()
-        return climate_data
-
-
-if __name__ == "__main__":
-    if "building_info" not in st.session_state:
-        st.session_state.building_info = {"country": "Iceland", "city": "Reykjavik"}
-    if "page" not in st.session_state:
-        st.session_state.page = "Climate Data"
-    
-    climate_data = ClimateData()
-    climate_data.display_climate_input(st.session_state)
+# ... (Rest of the code unchanged) ...