Update app/hvac_loads.py

app/hvac_loads.py

@@ -685,12 +685,10 @@ class TFMCalculations:
     @staticmethod
     def filter_hourly_data(hourly_data: List[Dict], sim_period: Dict, climate_data: Dict) -> List[Dict]:
         """Filter hourly data based on simulation period, ignoring year."""
-        sim_type = sim_period["type"]
-        if sim_type == "Full Year":
+        if sim_period["type"] == "Full Year":
             return hourly_data
         filtered_data = []
-        
-        if sim_type == "From Date to Date":
+        if sim_period["type"] == "From-to":
             start_month = sim_period["start_date"].month
             start_day = sim_period["start_date"].day
             end_month = sim_period["end_date"].month
@@ -700,31 +698,12 @@ class TFMCalculations:
                 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)
-        
-        elif sim_type in ["Heating Only", "Cooling Only"]:
-            base_temp = sim_period.get("base_temp", 18.3 if sim_type == "Heating Only" else 23.9)
+        elif sim_period["type"] in ["HDD", "CDD"]:
+            base_temp = sim_period.get("base_temp", 18.3 if sim_period["type"] == "HDD" else 23.9)
             for data in hourly_data:
                 temp = data["dry_bulb"]
-                if (sim_type == "Heating Only" and temp < base_temp) or \
-                   (sim_type == "Cooling Only" and temp > base_temp):
+                if (sim_period["type"] == "HDD" and temp < base_temp) or (sim_period["type"] == "CDD" and temp > base_temp):
                     filtered_data.append(data)
-        
-        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, {})
-            if not period:
-                logger.warning(f"No data found for {sim_type} in typical_extreme_periods.")
-                return []
-            start_month = period["start"]["month"]
-            start_day = period["start"]["day"]
-            end_month = period["end"]["month"]
-            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)
-        
         return filtered_data
 
     @staticmethod
@@ -858,116 +837,24 @@ class TFMCalculations:
 def display_hvac_loads_page():
     """
     Display the HVAC Loads page in the Streamlit application.
-    Allows users to configure location, simulation period, indoor conditions,
+    Allows users to configure simulation period, indoor conditions, and HVAC settings,
     calculates HVAC loads using TFMCalculations, and displays results.
     """
     try:
         st.header("HVAC Loads")
         st.markdown("Configure and calculate HVAC loads for the building.")
 
-        # Location Information
-        st.subheader("Location Information")
-        climate_data = st.session_state.project_data["climate_data"]
-        location_data = {
-            "Country": climate_data.get("location", {}).get("country", ""),
-            "City": climate_data.get("location", {}).get("city", ""),
-            "State/Province": climate_data.get("location", {}).get("state_province", ""),
-            "Latitude": climate_data.get("latitude", 0.0),
-            "Longitude": climate_data.get("longitude", 0.0),
-            "Elevation": climate_data.get("elevation", 0.0),
-            "Time Zone": climate_data.get("timezone", 0.0),
-            "Ground Reflectivity": climate_data.get("ground_reflectivity", 0.2)
-        }
-        
-        # Create two rows with four columns each
-        col1, col2, col3, col4 = st.columns(4)
-        with col1:
-            country = st.text_input("Country", value=location_data["Country"], key="hvac_country")
-        with col2:
-            city = st.text_input("City", value=location_data["City"], key="hvac_city")
-        with col3:
-            state_province = st.text_input("State/Province", value=location_data["State/Province"], key="hvac_state_province")
-        with col4:
-            latitude = st.number_input(
-                "Latitude (°)",
-                min_value=-90.0,
-                max_value=90.0,
-                value=location_data["Latitude"],
-                step=0.1,
-                key="hvac_latitude"
-            )
-        
-        col5, col6, col7, col8 = st.columns(4)
-        with col5:
-            longitude = st.number_input(
-                "Longitude (°)",
-                min_value=-180.0,
-                max_value=180.0,
-                value=location_data["Longitude"],
-                step=0.1,
-                key="hvac_longitude"
-            )
-        with col6:
-            elevation = st.number_input(
-                "Elevation (m)",
-                min_value=0.0,
-                max_value=10000.0,
-                value=location_data["Elevation"],
-                step=1.0,
-                key="hvac_elevation"
-            )
-        with col7:
-            timezone = st.number_input(
-                "Time Zone (UTC offset)",
-                min_value=-12.0,
-                max_value=14.0,
-                value=location_data["Time Zone"],
-                step=0.5,
-                key="hvac_timezone"
-            )
-        with col8:
-            ground_reflectivity = st.number_input(
-                "Ground Reflectivity",
-                min_value=0.0,
-                max_value=1.0,
-                value=location_data["Ground Reflectivity"],
-                step=0.01,
-                key="hvac_ground_reflectivity"
-            )
-        
-        if st.button("Save Location"):
-            st.session_state.project_data["climate_data"]["location"].update({
-                "country": country,
-                "city": city,
-                "state_province": state_province
-            })
-            st.session_state.project_data["climate_data"].update({
-                "latitude": latitude,
-                "longitude": longitude,
-                "elevation": elevation,
-                "timezone": timezone,
-                "ground_reflectivity": ground_reflectivity
-            })
-            st.success("Location information saved successfully.")
-            logger.info("Location information updated in session state")
-
         # Simulation Period Configuration
         st.subheader("Simulation Period")
         sim_type = st.selectbox(
             "Simulation Type",
-            ["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
-             "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"],
+            ["Full Year", "From-to", "HDD", "CDD"],
             key="hvac_sim_type",
-            index=["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
-                   "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"].index(
-                       st.session_state.project_data["sim_period"]["type"]
-                   ) if st.session_state.project_data["sim_period"]["type"] in 
-                   ["Full Year", "From Date to Date", "Heating Only", "Cooling Only", 
-                    "Summer Extreme", "Summer Typical", "Winter Extreme", "Winter Typical"] else 0
+            index=["Full Year", "From-to", "HDD", "CDD"].index(st.session_state.project_data["sim_period"]["type"])
         )
         st.session_state.project_data["sim_period"]["type"] = sim_type
 
-        if sim_type == "From Date to Date":
+        if sim_type == "From-to":
             col1, col2 = st.columns(2)
             with col1:
                 start_date = st.date_input(
@@ -983,18 +870,18 @@ def display_hvac_loads_page():
                 )
             st.session_state.project_data["sim_period"]["start_date"] = start_date
             st.session_state.project_data["sim_period"]["end_date"] = end_date
-        elif sim_type in ["Heating Only", "Cooling Only"]:
+        elif sim_type in ["HDD", "CDD"]:
             base_temp = st.number_input(
                 "Base Temperature (°C)",
                 min_value=0.0,
                 max_value=40.0,
-                value=st.session_state.project_data["sim_period"].get("base_temp", 18.3 if sim_type == "Heating Only" else 23.9),
+                value=st.session_state.project_data["sim_period"]["base_temp"],
                 step=0.1,
                 key="hvac_base_temp"
             )
             st.session_state.project_data["sim_period"]["base_temp"] = base_temp
 
-        # Indoor Conditions Configuration (unchanged)
+        # Indoor Conditions Configuration
         st.subheader("Indoor Conditions")
         indoor_type = st.selectbox(
             "Indoor Conditions Type",
@@ -1057,7 +944,37 @@ def display_hvac_loads_page():
             )
             st.session_state.project_data["indoor_conditions"]["adaptive_acceptability"] = acceptability
 
-        # Calculate HVAC Loads (unchanged)
+        # HVAC Settings Configuration
+        st.subheader("HVAC Settings")
+        col1, col2 = st.columns(2)
+        with col1:
+            start_hour = st.number_input(
+                "Operating Start Hour",
+                min_value=0,
+                max_value=23,
+                value=st.session_state.project_data["hvac_settings"]["operating_hours"][0]["start"],
+                step=1,
+                key="hvac_start_hour"
+            )
+        with col2:
+            end_hour = st.number_input(
+                "Operating End Hour",
+                min_value=0,
+                max_value=23,
+                value=st.session_state.project_data["hvac_settings"]["operating_hours"][0]["end"],
+                step=1,
+                key="hvac_end_hour"
+            )
+        system_type = st.selectbox(
+            "HVAC System Type",
+            ["Default", "VAV", "CAV", "VRF"],
+            key="hvac_system_type",
+            index=["Default", "VAV", "CAV", "VRF"].index(st.session_state.project_data["hvac_settings"]["system_type"])
+        )
+        st.session_state.project_data["hvac_settings"]["operating_hours"] = [{"start": start_hour, "end": end_hour}]
+        st.session_state.project_data["hvac_settings"]["system_type"] = system_type
+
+        # Calculate HVAC Loads
         if st.button("Calculate HVAC Loads"):
             try:
                 components = st.session_state.project_data["components"]
@@ -1087,7 +1004,7 @@ def display_hvac_loads_page():
                         hvac_settings=hvac_settings
                     )
 
-                    # Update session state with results (unchanged)
+                    # Update session state with results
                     cooling_loads = [load for load in loads if load["total_cooling"] > 0]
                     heating_loads = [load for load in loads if load["total_heating"] > 0]
                     st.session_state.project_data["hvac_loads"]["cooling"]["hourly"] = cooling_loads