Update utils/cooling_load.py

utils/cooling_load.py

@@ -4,7 +4,7 @@ Based on ASHRAE steady-state calculation methods.
 
 Author: Dr Majed Abuseif
 Date: April 2025
-Version: 1.0.4
+Version: 1.0.5
 """
 
 import streamlit as st
@@ -28,7 +28,7 @@ class CoolingLoadCalculator:
         self.ashrae_tables = ASHRAETables()
         self.heat_transfer = HeatTransferCalculations()
         self.hours = list(range(24))
-        self.valid_latitudes = ['24N', '36N', '48N']
+        self.valid_latitudes = ['24N', '32N', '40N', '48N', '56N']  # Updated to match error message
         self.valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
         self.valid_wall_groups = ['A', 'B', 'C', 'D']
         self.valid_roof_groups = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
@@ -41,13 +41,15 @@ class CoolingLoadCalculator:
             latitude: Latitude input (str, float, or other)
             
         Returns:
-            Valid latitude string ('24N', '36N', or '48N')
+            Valid latitude string ('24N', '32N', '40N', '48N', '56N')
         """
         try:
             if not isinstance(latitude, str):
                 latitude = str(latitude)
             
             latitude = latitude.strip().upper()
+            if st.session_state.get('debug_mode', False):
+                logger.debug(f"Validating latitude: {latitude}")
             
             # Handle concatenated formats like '24N_JUL'
             if '_' in latitude:
@@ -58,33 +60,43 @@ class CoolingLoadCalculator:
                         logger.warning(f"Detected concatenated input: {latitude}. Using latitude={lat_part}")
                     latitude = lat_part
             
-            # Handle formats like '31.973N', '1_31.973N'
+            # Handle numerical formats like '31.973N'
             if '.' in latitude or any(c.isdigit() for c in latitude):
+                # Extract numerical part, removing 'N' or 'S'
                 num_part = ''.join(c for c in latitude if c.isdigit() or c == '.')
                 try:
                     lat_val = float(num_part)
-                    if lat_val <= 30:
-                        return '24N'
-                    elif lat_val <= 42:
-                        return '36N'
+                    if lat_val <= 28:
+                        mapped_latitude = '24N'
+                    elif lat_val <= 36:
+                        mapped_latitude = '32N'
+                    elif lat_val <= 44:
+                        mapped_latitude = '40N'
+                    elif lat_val <= 52:
+                        mapped_latitude = '48N'
                     else:
-                        return '48N'
+                        mapped_latitude = '56N'
+                    if st.session_state.get('debug_mode', False):
+                        logger.debug(f"Mapped numerical latitude {lat_val} to {mapped_latitude}")
+                    return mapped_latitude
                 except ValueError:
                     if st.session_state.get('debug_mode', False):
-                        logger.warning(f"Cannot parse latitude: {latitude}. Defaulting to '24N'")
-                    return '24N'
+                        logger.warning(f"Cannot parse numerical latitude: {latitude}. Defaulting to '32N'")
+                    return '32N'
             
-            if latitude not in self.valid_latitudes:
-                if st.session_state.get('debug_mode', False):
-                    logger.warning(f"Invalid latitude: {latitude}. Defaulting to '24N'")
-                return '24N'
+            # Check if latitude is already valid
+            if latitude in self.valid_latitudes:
+                return latitude
             
-            return latitude
+            # Handle invalid or unrecognized formats
+            if st.session_state.get('debug_mode', False):
+                logger.warning(f"Invalid latitude: {latitude}. Defaulting to '32N'")
+            return '32N'
         
         except Exception as e:
             if st.session_state.get('debug_mode', False):
                 logger.error(f"Error validating latitude {latitude}: {str(e)}")
-            return '24N'
+            return '32N'
     
     def validate_month(self, month: Any) -> str:
         """
@@ -174,7 +186,7 @@ class CoolingLoadCalculator:
         
         try:
             # Validate inputs
-            latitude = self.validate_latitude(outdoor_conditions.get('latitude', '24N'))
+            latitude = self.validate_latitude(outdoor_conditions.get('latitude', '32N'))
             month = self.validate_month(outdoor_conditions.get('month', 'JUL'))
             if st.session_state.get('debug_mode', False):
                 logger.debug(f"calculate_hourly_cooling_loads: latitude={latitude}, month={month}, outdoor_conditions={outdoor_conditions}")