Update data/ashrae_tables.py

data/ashrae_tables.py

@@ -1333,18 +1333,18 @@ class ASHRAETables:
             ValueError: If inputs are invalid or out of range.
         """
         import streamlit as st  # For debug logging
-
+    
         # Log inputs for debugging
         if st.session_state.get('debug_mode', False):
             st.write(f"Debug: get_cltd inputs: element_type={element_type}, group={group}, orientation={orientation}, hour={hour}, latitude={latitude}, solar_absorptivity={solar_absorptivity}")
-
+    
         if element_type not in ['wall', 'roof']:
             raise ValueError("element_type must be 'wall' or 'roof'")
         if hour not in range(24):
             raise ValueError("Hour must be between 0 and 23")
         if not 24 <= latitude <= 56:
             raise ValueError("Latitude must be between 24 and 56 degrees")
-
+    
         # Validate inputs
         is_wall = element_type == 'wall'
         latitude_str = f"{int(latitude)}N"
@@ -1352,25 +1352,25 @@ class ASHRAETables:
         is_valid, error_msg = self._validate_cltd_inputs(group, orientation, hour, latitude_str, month, solar_absorptivity, is_wall)
         if not is_valid:
             raise ValueError(error_msg)
-
+    
         # Available latitudes
-        latitudes = [24, 32, 40, 48, 56]
+        latitudes = [24, 32, 36, 44, 56]  # Updated to match table keys
         lat1, lat2 = max([lat for lat in latitudes if lat <= latitude], default=24), min([lat for lat in latitudes if lat >= latitude], default=56)
         
         # Log selected latitudes
         if st.session_state.get('debug_mode', False):
             st.write(f"Debug: Selected latitudes for interpolation: lat1={lat1}, lat2={lat2}")
-
+    
         # Load the appropriate table
         table = self.cltd_wall if element_type == 'wall' else self.cltd_roof
-        key1 = f"{group}_{int(lat1)}"
-        key2 = f"{group}_{int(lat2)}"
+        key1 = f"{group}_{int(lat1)}N"  # e.g., A_32N
+        key2 = f"{group}_{int(lat2)}N"  # e.g., A_32N
         
         # Check if keys exist; use fallback if not
         if key1 not in table or key2 not in table:
             if st.session_state.get('debug_mode', False):
                 st.write(f"Debug: Available table keys: {list(table.keys())}")
-                st.error(f"Warning: Group {group} not found for latitude {lat1} or {lat2}. Using fallback CLTD value.")
+                st.error(f"Warning: Group {group} not found for latitude {lat1}N or {lat2}N. Using fallback CLTD value.")
             # Fallback CLTD value (average for medium construction, per ASHRAE)
             cltd = 8.0
         else:
@@ -1393,14 +1393,14 @@ class ASHRAETables:
                     cltd = cltd1 + weight * (cltd2 - cltd1)
                     if st.session_state.get('debug_mode', False):
                         st.write(f"Debug: Interpolated CLTD: weight={weight}, cltd={cltd}")
-
+    
         # Apply corrections
         lm = self.month_correction.get(month, 0.0)  # Simplified access for July
         f = self._load_fenestration_correction().get('Standard', 1.0)
         corrected_cltd = self.apply_cltd_corrections(cltd, lm, solar_absorptivity, f)
         if st.session_state.get('debug_mode', False):
             st.write(f"Debug: Applied corrections: lm={lm}, f={f}, corrected_cltd={corrected_cltd}")
-
+    
         return corrected_cltd
 
     @lru_cache(maxsize=1000)