Update data/drapery.py

data/drapery.py

@@ -395,7 +395,6 @@ class Drapery:
         }
         return reductions.get(self.openness, 0.10)
 
-
 class CLTDCalculator:
     """Class for calculating Cooling Load Temperature Difference (CLTD) values."""
     
@@ -423,12 +422,18 @@ class CLTDCalculator:
         try:
             if isinstance(latitude, str):
                 lat_str = latitude.upper().strip().replace('°', '').replace(' ', '')
+                logger.debug(f"Processing latitude string: {lat_str}")
                 num_part = ''.join(c for c in lat_str if c.isdigit() or c == '.')
-                lat_val = float(num_part)
+                try:
+                    lat_val = float(num_part)
+                except ValueError:
+                    logger.error(f"Failed to parse numerical part from latitude: {lat_str}")
+                    raise ValueError(f"Invalid latitude format: {latitude}. Expected format like '32N'")
                 if 'S' in lat_str:
                     lat_val = -lat_val
             else:
                 lat_val = float(latitude)
+                logger.debug(f"Processing numerical latitude: {lat_val}")
             abs_lat = abs(lat_val)
             if abs_lat < 28:
                 mapped_latitude = '24N'
@@ -440,9 +445,16 @@ class CLTDCalculator:
                 mapped_latitude = '48N'
             else:
                 mapped_latitude = '56N'
-        except (ValueError, TypeError):
-            raise ValueError(f"Invalid latitude: {latitude}. Use number (e.g., 40) or string (e.g., '40N')")
-        self.latitude = Latitude[mapped_latitude]
+            logger.debug(f"Mapped latitude: {lat_val} -> {mapped_latitude}")
+        except (ValueError, TypeError) as e:
+            logger.error(f"Invalid latitude: {latitude}. Defaulting to 40N. Error: {str(e)}")
+            mapped_latitude = '40N'
+        try:
+            self.latitude = Latitude[mapped_latitude]
+            logger.debug(f"Set latitude enum: {self.latitude}")
+        except KeyError:
+            logger.error(f"Latitude {mapped_latitude} not found in Latitude enum. Defaulting to LAT_40N")
+            self.latitude = Latitude.LAT_40N
         
         # Initialize ASHRAE tables
         self.ashrae_tables = ASHRAETables()
@@ -839,10 +851,22 @@ class CLTDCalculator:
         Returns:
             Corrected CLTD value (°C)
         """
+        # Map glazing type to table keys
+        glazing_key_map = {
+            'Single Clear': 'SingleClear',
+            'Double Tinted': 'DoubleTinted',
+            'Low-E': 'LowE',
+            'Reflective': 'Reflective'
+        }
+        glazing_key = glazing_key_map.get(glazing_type, glazing_type)
+        logger.debug(f"get_cltd_window: glazing_type={glazing_type}, mapped_glazing_key={glazing_key}, orientation={orientation}, hour={hour}, latitude={self.latitude.value}")
         try:
-            base_cltd = self.cltd_window_tables[self.latitude.value][glazing_type][orientation][hour]
-        except KeyError:
-            base_cltd = 0.0
+            base_cltd = self.cltd_window_tables[self.latitude.value][glazing_key][orientation][hour]
+            logger.debug(f"Base CLTD: {base_cltd}")
+        except KeyError as e:
+            logger.error(f"KeyError in cltd_window_tables: latitude={self.latitude.value}, glazing_key={glazing_key}, orientation={orientation}, hour={hour}. Error: {str(e)}")
+            logger.warning("Using default CLTD=8.0°C")
+            base_cltd = 8.0
         
         # Apply corrections
         latitude_factor = self.latitude_corrections.get(self.latitude.value, 1.0)
@@ -850,6 +874,7 @@ class CLTDCalculator:
         temp_correction = (self.outdoor_avg_temp - 29.4) + (self.indoor_temp - 24.0)
         
         corrected_cltd = base_cltd * latitude_factor * month_factor + temp_correction
+        logger.debug(f"Applied corrections: base_cltd={base_cltd}, latitude_factor={latitude_factor}, month_factor={month_factor}, temp_correction={temp_correction}, corrected_cltd={corrected_cltd}")
         return max(0.0, corrected_cltd)
     
     def get_cltd_door(self, door_type: str, orientation: str, hour: int) -> float: