Update data/ashrae_tables.py

data/ashrae_tables.py

@@ -581,20 +581,6 @@ class ASHRAETables:
         except Exception as e:
             raise ValueError(f"Error applying climatic corrections: {str(e)}")
 
-    def get_cltd_wall(self, wall_group: str, orientation: str, hour: int) -> float:
-        """Get CLTD value for a wall."""
-        if wall_group not in self.cltd_wall:
-            raise ValueError(f"Invalid wall group: {wall_group}")
-        orientation_map = {e.value: e.name for e in Orientation}
-        orientation_abbr = orientation_map.get(orientation, orientation)
-        if orientation_abbr not in self.cltd_wall[wall_group].columns:
-            raise ValueError(f"Invalid orientation: {orientation}")
-        # Normalize hour to 0-23 range for cyclic data
-        normalized_hour = hour % 24
-        if normalized_hour not in self.cltd_wall[wall_group].index:
-            raise ValueError(f"Invalid hour: {hour} (normalized to {normalized_hour})")
-        return float(self.cltd_wall[wall_group].loc[normalized_hour, orientation_abbr])
-
     def calculate_corrected_cltd_wall(self, wall_group: str, orientation: str, hour: int, latitude: str, month: str, color: str, outdoor_temp: float, indoor_temp: float) -> float:
         """
         Calculate corrected CLTD for a wall with climatic corrections.
@@ -616,15 +602,38 @@ class ASHRAETables:
             ValueError: If inputs are invalid or correction fails.
         """
         try:
-            # Validate hour
-            if not isinstance(hour, int):
-                raise ValueError(f"Hour must be an integer, got: {hour}")
-            # Normalize hour to 0-23 range
-            normalized_hour = hour % 24
             # Get base CLTD
-            base_cltd = self.get_cltd_wall(wall_group, orientation, normalized_hour)
+            base_cltd = self.get_cltd_wall(wall_group, orientation, hour)
+            # Apply climatic corrections
+            corrected_cltd = self._apply_climatic_corrections(base_cltd, latitude, month, color, outdoor_temp, indoor_temp)
+            return corrected_cltd
+        except Exception as e:
+            raise ValueError(f"Error calculating corrected CLTD for wall: {str(e)}")
+
+    def calculate_corrected_cltd_roof(self, roof_group: str, latitude: str, hour: int, month: str, color: str, outdoor_temp: float, indoor_temp: float) -> float:
+        """
+        Calculate corrected CLTD for a roof with climatic corrections.
+        
+        Args:
+            roof_group (str): Roof group (e.g., 'A', 'B', ..., 'G').
+            latitude (str): Latitude (e.g., '24N', '36N', '48N').
+            hour (int): Hour of the day (0-23).
+            month (str): Month (e.g., 'Jul').
+            color (str): Surface color ('Dark', 'Medium', 'Light').
+            outdoor_temp (float): Outdoor design temperature (°C).
+            indoor_temp (float): Indoor design temperature (°C).
+        
+        Returns:
+            float: Corrected CLTD value (°C).
+        
+        Raises:
+            ValueError: If inputs are invalid or correction fails.
+        """
+        try:
+            # Get base CLTD
+            base_cltd = self.get_cltd_roof(roof_group, latitude, hour)
             # Apply climatic corrections
             corrected_cltd = self._apply_climatic_corrections(base_cltd, latitude, month, color, outdoor_temp, indoor_temp)
             return corrected_cltd
         except Exception as e:
-            raise ValueError(f"Error calculating corrected CLTD for wall: {str(e)}")
+            raise ValueError(f"Error calculating corrected CLTD for roof: {str(e)}")