Update utils/cooling_load.py

utils/cooling_load.py

@@ -27,6 +27,26 @@ class CoolingLoadCalculator:
         self.ashrae_tables = ASHRAETables()
         self.heat_transfer = HeatTransferCalculations()
         self.hours = list(range(24))
+        self.valid_latitudes = ['24N', '36N', '48N']
+        self.valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
+    
+    def validate_latitude(self, latitude: str) -> str:
+        """Validate and return a valid latitude."""
+        if not isinstance(latitude, str) or '_' in latitude:
+            logger.warning(f"Invalid latitude format: {latitude}. Defaulting to '24N'")
+            return '24N'
+        if latitude not in self.valid_latitudes:
+            logger.warning(f"Latitude {latitude} not in {self.valid_latitudes}. Defaulting to '24N'")
+            return '24N'
+        return latitude
+    
+    def validate_month(self, month: str) -> str:
+        """Validate and return a valid month in uppercase."""
+        month_upper = month.upper()
+        if month_upper not in self.valid_months:
+            logger.warning(f"Invalid month: {month}. Defaulting to 'JUL'")
+            return 'JUL'
+        return month_upper
     
     def calculate_hourly_cooling_loads(
         self,
@@ -67,21 +87,10 @@ class CoolingLoadCalculator:
         }
         
         try:
-            # Validate outdoor conditions
-            valid_latitudes = ['24N', '36N', '48N']
-            latitude = outdoor_conditions.get('latitude', '24N')
-            if not isinstance(latitude, str) or '_' in latitude:
-                raise ValueError(f"Invalid latitude format: {latitude}. Expected format: '24N', '36N', or '48N'")
-            if latitude not in valid_latitudes:
-                logger.warning(f"Latitude {latitude} not in {valid_latitudes}. Defaulting to '24N'")
-                latitude = '24N'
-
-            valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-            month = outdoor_conditions.get('month', 'JUL').upper()
-            if month not in valid_months:
-                raise ValueError(f"Invalid month: {month}. Must be one of {valid_months}")
-
-            logger.debug(f"Using latitude={latitude}, month={month} for calculations")
+            # Validate inputs
+            latitude = self.validate_latitude(outdoor_conditions.get('latitude', '24N'))
+            month = self.validate_month(outdoor_conditions.get('month', 'JUL'))
+            logger.debug(f"calculate_hourly_cooling_loads: latitude={latitude}, month={month}")
 
             # Calculate loads for walls
             for wall in building_components.get('walls', []):
@@ -316,6 +325,10 @@ class CoolingLoadCalculator:
             Cooling load in Watts
         """
         try:
+            latitude = self.validate_latitude(latitude)
+            month = self.validate_month(month)
+            logger.debug(f"calculate_wall_cooling_load: latitude={latitude}, month={month}")
+
             cltd = self.ashrae_tables.calculate_corrected_cltd_wall(
                 wall_group=wall.wall_group,
                 orientation=wall.orientation.value,
@@ -357,6 +370,11 @@ class CoolingLoadCalculator:
             Cooling load in Watts
         """
         try:
+            # Validate inputs
+            latitude = self.validate_latitude(latitude)
+            month = self.validate_month(month)
+            logger.debug(f"calculate_roof_cooling_load: latitude={latitude}, month={month}")
+
             # Validate and map roof_group
             valid_roof_groups = ['A', 'B', 'C', 'D', 'E', 'F', 'G']
             roof_group = roof.roof_group
@@ -366,12 +384,6 @@ class CoolingLoadCalculator:
                 else:
                     raise ValueError(f"Invalid roof group: {roof_group}. Must be one of {valid_roof_groups}")
             
-            # Validate and map latitude
-            valid_latitudes = ['24N', '36N', '48N']
-            if latitude not in valid_latitudes:
-                logger.warning(f"Latitude {latitude} not in {valid_latitudes}. Defaulting to '24N'")
-                latitude = '24N'
-            
             cltd = self.ashrae_tables.calculate_corrected_cltd_roof(
                 roof_group=roof_group,
                 hour=hour,
@@ -414,20 +426,10 @@ class CoolingLoadCalculator:
             Dictionary with conduction and solar loads in Watts
         """
         try:
-            # Validate month
-            valid_months = ['JAN', 'FEB', 'MAR', 'APR', 'MAY', 'JUN', 'JUL', 'AUG', 'SEP', 'OCT', 'NOV', 'DEC']
-            month_upper = month.upper()
-            if month_upper not in valid_months:
-                raise ValueError(f"Invalid month: {month}. Must be one of {valid_months}")
-
-            # Validate latitude
-            valid_latitudes = ['24N', '36N', '48N']
-            scl_latitude = latitude
-            if not isinstance(latitude, str) or '_' in latitude:
-                raise ValueError(f"Invalid latitude format: {latitude}. Expected format: '24N', '36N', or '48N'")
-            if latitude not in valid_latitudes:
-                logger.warning(f"Latitude {latitude} not in {valid_latitudes}. Defaulting to '24N'")
-                scl_latitude = '24N'
+            # Validate inputs
+            scl_latitude = self.validate_latitude(latitude)
+            month_upper = self.validate_month(month)
+            logger.debug(f"calculate_window_cooling_load: latitude={scl_latitude}, month={month_upper}")
 
             # Conduction load
             delta_t = outdoor_temp - indoor_temp
@@ -437,26 +439,40 @@ class CoolingLoadCalculator:
             # Note: Solar altitude is not computed directly, as ASHRAE SCL tables (via get_scl)
             # account for solar geometry effects based on month, orientation, hour, and latitude.
             logger.debug(f"Calling get_scl with month={month_upper}, orientation={window.orientation.value}, hour={hour}, latitude={scl_latitude}")
-            try:
-                scl = self.ashrae_tables.get_scl(
-                    month=month_upper,
-                    orientation=window.orientation.value,
-                    hour=hour,
-                    latitude=scl_latitude
-                )
-            except Exception as e:
-                logger.error(f"get_scl failed: {str(e)}")
-                # Fallback: Retry with default latitude if error involves latitude/month combination
-                if "36N_JUL" in str(e):
-                    logger.warning(f"Retrying get_scl with fallback latitude='24N'")
+            
+            # Try different month formats to handle potential get_scl issues
+            month_formats = [
+                (month_upper, "uppercase"),  # e.g., 'JUL'
+                (month_upper.capitalize(), "capitalized"),  # e.g., 'Jul'
+                (str({'JAN': 1, 'FEB': 2, 'MAR': 3, 'APR': 4, 'MAY': 5, 'JUN': 6,
+                      'JUL': 7, 'AUG': 8, 'SEP': 9, 'OCT': 10, 'NOV': 11, 'DEC': 12}[month_upper]), "numeric")  # e.g., '7'
+            ]
+            
+            scl = None
+            for month_value, format_name in month_formats:
+                try:
+                    logger.debug(f"Trying get_scl with month format '{format_name}': month={month_value}")
                     scl = self.ashrae_tables.get_scl(
-                        month=month_upper,
+                        month=month_value,
                         orientation=window.orientation.value,
                         hour=hour,
-                        latitude='24N'
+                        latitude=scl_latitude
                     )
-                else:
-                    raise ValueError(f"Failed to retrieve SCL for month={month_upper}, orientation={window.orientation.value}, hour={hour}, latitude={scl_latitude}: {str(e)}")
+                    logger.debug(f"Success with month format '{format_name}'")
+                    break
+                except Exception as e:
+                    logger.warning(f"get_scl failed with month format '{format_name}': {str(e)}")
+                    continue
+            
+            # Final fallback: Use latitude='24N' with default month='JUL'
+            if scl is None:
+                logger.warning(f"All month formats failed. Retrying with fallback latitude='24N', month='JUL'")
+                scl = self.ashrae_tables.get_scl(
+                    month='JUL',
+                    orientation=window.orientation.value,
+                    hour=hour,
+                    latitude='24N'
+                )
             
             solar_load = window.area * window.shgc * scl * shading_coefficient
             
@@ -722,7 +738,7 @@ if __name__ == "__main__":
         'relative_humidity': 50.0,
         'ground_temperature': 20.0,
         'month': 'Jul',
-        'latitude': '36N',
+        'latitude': '24N',
         'wind_speed': 4
     }
 
@@ -741,15 +757,25 @@ if __name__ == "__main__":
 
     building_volume = 300.0
 
-    # Calculate loads
-    try:
-        hourly_loads = calculator.calculate_hourly_cooling_loads(
-            building_components,
-            outdoor_conditions,
-            indoor_conditions,
-            internal_loads,
-            building_volume
-        )
-        print("Hourly Loads:", hourly_loads)
-    except Exception as e:
-        print(f"Error in example calculation: {str(e)}")
+    # Test with multiple latitudes and months
+    test_cases = [
+        {'latitude': '24N', 'month': 'Jul'},
+        {'latitude': '36N', 'month': 'Jul'},
+        {'latitude': '48N', 'month': 'Jan'},
+        {'latitude': 'invalid', 'month': 'invalid'}  # Test invalid inputs
+    ]
+
+    for case in test_cases:
+        outdoor_conditions['latitude'] = case['latitude']
+        outdoor_conditions['month'] = case['month']
+        try:
+            hourly_loads = calculator.calculate_hourly_cooling_loads(
+                building_components,
+                outdoor_conditions,
+                indoor_conditions,
+                internal_loads,
+                building_volume
+            )
+            print(f"Success for latitude={case['latitude']}, month={case['month']}: Hourly Loads calculated")
+        except Exception as e:
+            print(f"Error for latitude={case['latitude']}, month={case['month']}: {str(e)}")