Delete parameter from smallest_difference() in tools

Author: SabineHaas

windpowerlib/modelchain.py

@@ -158,7 +158,7 @@ def rho_hub(self, weather, data_height):
         temp_air_closest = values.corresp_value
         # Check if temperature data is at hub height.
         if temp_air_height == self.wind_turbine.hub_height:
-            logging.debug('Using given temperature ' + values.logging_string)
+            logging.debug('Using given temperature at hub height.')
             temp_hub = temp_air_closest
         # Calculation of temperature in K at hub height.
         elif self.temperature_model == 'gradient':
@@ -236,7 +236,7 @@ def v_wind_hub(self, weather, data_height):
         v_wind_closest = values.corresp_value
         # Check if wind speed data is at hub height.
         if v_wind_height == self.wind_turbine.hub_height:
-            logging.debug('Using given wind speed ' + values.logging_string)
+            logging.debug('Using given wind speed at hub height.')
             v_wind = v_wind_closest
         # Calculation of wind speed in m/s at hub height.
         elif self.wind_model == 'logarithmic':

windpowerlib/tools.py

@@ -37,28 +37,17 @@ def smallest_difference(value_1, value_2, comp_value, corresp_1, corresp_2):
 
     Returns
     -------
-    Tuple(float, float, string)
-        Value closer to comparing value as float, corresponding value as
-        float and a string for logging.debug.
+    Tuple(float, float,)
+        Value closer to comparing value as float and its corresponding value as
+        float.
     """
     if (value_2 is not None and corresp_2 is not None):
-        if value_1 == comp_value:
+        if abs(value_1 - comp_value) <= abs(value_2 - comp_value):
             closest_value = value_1
-            logging_string = '(at hub height).'
-        elif value_2 == comp_value:
-            closest_value = value_2
-            logging_string = '(2) (at hub height).'
-        elif abs(value_1 - comp_value) <= abs(value_2 - comp_value):
-            closest_value = value_1
-            logging_string = None
         else:
             closest_value = value_2
-            logging_string = None
     else:
         closest_value = value_1
-        logging_string = None
-        if value_1 == comp_value:
-            logging_string = '(at hub height).'
 
     # Select correponding value
     if closest_value == value_1:
@@ -68,5 +57,5 @@ def smallest_difference(value_1, value_2, comp_value, corresp_1, corresp_2):
     # Store values in a named tuple
     return_tuple = collections.namedtuple('selected_values',
                                           ['closest_value',
-                                           'corresp_value', 'logging_string'])
-    return return_tuple(closest_value, corresp_value, logging_string)
+                                           'corresp_value'])
+    return return_tuple(closest_value, corresp_value)