update2

pnnl · Sep 18, 2024 · c25cdfc · c25cdfc
1 parent a11019e
commit c25cdfc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/copper/library.py b/copper/library.py
@@ -44,6 +44,7 @@ def __init__(self, path=chiller_lib, rating_std="", export=False):
                         and not "indoor_fan_speeds_mapping" in p
                         and not "indoor_fan_speeds" in p
                         and not "infdoor_fan_curve_coef" in p
+                        and not "indoor_fan_curve" in p
                     ):
                         obj_args[p] = vals[p]
                     elif (
@@ -119,6 +120,7 @@ def load_obj(self, data):
                 and not "indoor_fan_speeds_mapping" in p
                 and not "indoor_fan_speeds" in p
                 and not "infdoor_fan_curve_coef" in p
+                and not "indoor_fan_curve" in p
             ):
                 obj_args[p] = data[p]
 
@@ -211,6 +213,7 @@ def find_set_of_curves_from_lib(self, filters=[], part_eff_flag=False):
                         or "alt" in p
                         or "degradation_coefficient" in p
                         or "infdoor_fan_curve_coef" in p
+                        or "indoor_fan_curve" in p
                     ):
                         pass
                     else:

diff --git a/copper/unitarydirectexpansion.py b/copper/unitarydirectexpansion.py
@@ -59,6 +59,7 @@ def __init__(
             "4": 0.63 * 0.9437,
         },
         indoor_fan_speeds=1,
+        indoor_fan_curve=0,
         fan_power_unit="kW",
     ):
         global log_fan
@@ -162,7 +163,7 @@ def __init__(
         self.indoor_fan_power = indoor_fan_power
         self.infdoor_fan_curve_coef = infdoor_fan_curve_coef
         self.fan_power_unit = fan_power_unit
-
+        self.indoor_fan_curve = indoor_fan_curve
         # Define rated temperatures
         # air entering drybulb, air entering wetbulb, entering condenser temperature, leaving condenser temperature
         aed, self.aew, ect, lct = self.get_rated_temperatures()
@@ -225,7 +226,7 @@ def calc_fan_power(self, capacity_ratio):
         if capacity_ratio == 1 or self.indoor_fan_speeds == 1:
             return self.indoor_fan_power
         else:
-            if self.indoor_fan_speeds == 2:
+            if self.indoor_fan_curve == 0:
                 capacity_ratios = []
                 fan_power_fractions = []
                 for speed_info in self.indoor_fan_speeds_mapping.values():