Update utils/cooling_load.py

utils/cooling_load.py

@@ -436,8 +436,6 @@ class CoolingLoadCalculator:
             conduction_load = window.u_value * window.area * delta_t
             
             # Solar load
-            # 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 different month formats to handle potential get_scl issues
@@ -453,10 +451,10 @@ class CoolingLoadCalculator:
                 try:
                     logger.debug(f"Trying get_scl with month format '{format_name}': month={month_value}")
                     scl = self.ashrae_tables.get_scl(
+                        latitude=scl_latitude,
                         month=month_value,
                         orientation=window.orientation.value,
-                        hour=hour,
-                        latitude=scl_latitude
+                        hour=hour
                     )
                     logger.debug(f"Success with month format '{format_name}'")
                     break
@@ -468,10 +466,10 @@ class CoolingLoadCalculator:
             if scl is None:
                 logger.warning(f"All month formats failed. Retrying with fallback latitude='24N', month='JUL'")
                 scl = self.ashrae_tables.get_scl(
+                    latitude='24N',
                     month='JUL',
                     orientation=window.orientation.value,
-                    hour=hour,
-                    latitude='24N'
+                    hour=hour
                 )
             
             solar_load = window.area * window.shgc * scl * shading_coefficient
@@ -542,7 +540,13 @@ class CoolingLoadCalculator:
                 'Heavy Work': 180
             }.get(activity_level, 45)
             
-            clf = self.ashrae_tables.get_clf_people(hour, '8h')
+            logger.debug(f"Calling get_clf_people with zone_type='A', hours_occupied='6h', hour={hour}")
+            try:
+                clf = self.ashrae_tables.get_clf_people('A', '6h', hour)
+            except Exception as e:
+                logger.error(f"get_clf_people('A', '6h', {hour}) failed: {str(e)}")
+                logger.warning("Using default CLF=1.0 for people")
+                clf = 1.0
             
             sensible_load = num_people * sensible_gain * clf
             latent_load = num_people * latent_gain
@@ -576,7 +580,13 @@ class CoolingLoadCalculator:
             Cooling load in Watts
         """
         try:
-            clf = self.ashrae_tables.get_clf_lights(hour, '8h')
+            logger.debug(f"Calling get_clf_lights with zone_type='A', hours_on='8h', hour={hour}")
+            try:
+                clf = self.ashrae_tables.get_clf_lights('A', '8h', hour)
+            except Exception as e:
+                logger.error(f"get_clf_lights('A', '8h', {hour}) failed: {str(e)}")
+                logger.warning("Using default CLF=1.0 for lights")
+                clf = 1.0
             load = power * use_factor * special_allowance * clf
             return max(load, 0.0)
         
@@ -603,7 +613,13 @@ class CoolingLoadCalculator:
             Dictionary with sensible and latent loads in Watts
         """
         try:
-            clf = self.ashrae_tables.get_clf_equipment(hour, '8h')
+            logger.debug(f"Calling get_clf_equipment with zone_type='A', hours_operated='6h', hour={hour}")
+            try:
+                clf = self.ashrae_tables.get_clf_equipment('A', '6h', hour)
+            except Exception as e:
+                logger.error(f"get_clf_equipment('A', '6h', {hour}) failed: {str(e)}")
+                logger.warning("Using default CLF=1.0 for equipment")
+                clf = 1.0
             sensible_load = power * use_factor * radiation_factor * clf
             latent_load = power * use_factor * (1 - radiation_factor)