temperature -> temp_air; dewpoint -> temp_dew

Author: kandersolar

pvlib/atmosphere.py

@@ -337,15 +337,15 @@ def gueymard94_pw(temp_air, relative_humidity):
     return pw
 
 
-def rh_from_tdew(temperature, dewpoint, coeff=(6.112, 17.62, 243.12)):
+def rh_from_tdew(temp_air, temp_dew, coeff=(6.112, 17.62, 243.12)):
     """
     Calculate relative humidity from dewpoint temperature using the Magnus equation.
 
     Parameters
     ----------
-    temperature : numeric
+    temp_air : numeric
         Air temperature (dry-bulb temperature). [°C]
-    dewpoint : numeric
+    temp_dew : numeric
         Dew-point temperature. [°C]
     coeff : tuple, default (6.112, 17.62, 243.12)
         Magnus equation coefficients (A, B, C).  The default values are those
@@ -364,8 +364,8 @@ def rh_from_tdew(temperature, dewpoint, coeff=(6.112, 17.62, 243.12)):
     """
 
     # Calculate vapor pressure (e) and saturation vapor pressure (es)
-    e = coeff[0] * np.exp((coeff[1] * temperature) / (coeff[2] + temperature))
-    es = coeff[0] * np.exp((coeff[1] * dewpoint) / (coeff[2] + dewpoint))
+    e = coeff[0] * np.exp((coeff[1] * temp_air) / (coeff[2] + temp_air))
+    es = coeff[0] * np.exp((coeff[1] * temp_dew) / (coeff[2] + temp_dew))
 
     # Calculate relative humidity as percentage
     relative_humidity = 100 * (es / e)
@@ -374,15 +374,15 @@ def rh_from_tdew(temperature, dewpoint, coeff=(6.112, 17.62, 243.12)):
 
 
 def tdew_from_rh(
-    temperature, relative_humidity, coeff=(6.112, 17.62, 243.12)
+    temp_air, relative_humidity, coeff=(6.112, 17.62, 243.12)
 ):
     """
     Calculate dewpoint temperature using Magnus equation.
     This is a reversal of the calculation in :py:func:`rh_from_tdew`.
 
     Parameters
     ----------
-    temperature : numeric
+    temp_air : numeric
         Air temperature (dry-bulb temperature). [°C]
     relative_humidity : numeric
         Relative humidity (0-100). [%]
@@ -407,7 +407,7 @@ def tdew_from_rh(
 
     # First calculate ln(es/A)
     ln_term = (
-        (coeff[1] * temperature) / (coeff[2] + temperature)
+        (coeff[1] * temp_air) / (coeff[2] + temp_air)
         + np.log(relative_humidity/100)
     )
 

pvlib/tests/test_atmosphere.py

@@ -99,12 +99,12 @@ def test_tdew_to_rh_to_tdew():
 
     # Calculate relative humidity using pandas series as input
     relative_humidity = atmosphere.rh_from_tdew(
-        temperature=temperature_ambient,
-        dewpoint=dewpoint_original
+        temp_air=temperature_ambient,
+        temp_dew=dewpoint_original
     )
 
     dewpoint_calculated = atmosphere.tdew_from_rh(
-        temperature=temperature_ambient,
+        temp_air=temperature_ambient,
         relative_humidity=relative_humidity
     )
 
@@ -137,22 +137,22 @@ def test_rh_from_tdew():
 
     # Calculate relative humidity using pandas series as input
     rh_series = atmosphere.rh_from_tdew(
-        temperature=temperature_ambient,
-        dewpoint=dewpoint
+        temp_air=temperature_ambient,
+        temp_dew=dewpoint
     )
 
     # Calulate relative humidity using pandas series as input
     # with AEKR coefficients
     rh_series_aekr = atmosphere.rh_from_tdew(
-        temperature=temperature_ambient,
-        dewpoint=dewpoint,
+        temp_air=temperature_ambient,
+        temp_dew=dewpoint,
         coeff=(6.1094, 17.625, 243.04)
     )
 
     # Calculate relative humidity using array as input
     rh_array = atmosphere.rh_from_tdew(
-        temperature=temperature_ambient.to_numpy(),
-        dewpoint=dewpoint.to_numpy()
+        temp_air=temperature_ambient.to_numpy(),
+        temp_dew=dewpoint.to_numpy()
     )
 
     # test
@@ -175,8 +175,8 @@ def test_rh_from_tdew():
 
     # Calculate relative humidity using float as input
     rh_float = atmosphere.rh_from_tdew(
-        temperature=temperature_ambient.iloc[0],
-        dewpoint=dewpoint.iloc[0]
+        temp_air=temperature_ambient.iloc[0],
+        temp_dew=dewpoint.iloc[0]
     )
 
     assert np.isclose(
@@ -207,26 +207,26 @@ def test_tdew_from_rh():
 
     # test as series
     dewpoint_series = atmosphere.tdew_from_rh(
-        temperature=temperature_ambient,
+        temp_air=temperature_ambient,
         relative_humidity=relative_humidity_who
     )
 
     # test as series with AEKR coefficients
     dewpoint_series_aekr = atmosphere.tdew_from_rh(
-        temperature=temperature_ambient,
+        temp_air=temperature_ambient,
         relative_humidity=relative_humidity_aekr,
         coeff=(6.1094, 17.625, 243.04)
     )
 
     # test as numpy array
     dewpoint_array = atmosphere.tdew_from_rh(
-        temperature=temperature_ambient.to_numpy(),
+        temp_air=temperature_ambient.to_numpy(),
         relative_humidity=relative_humidity_who.to_numpy()
     )
 
     # test as float
     dewpoint_float = atmosphere.tdew_from_rh(
-        temperature=temperature_ambient.iloc[0],
+        temp_air=temperature_ambient.iloc[0],
         relative_humidity=relative_humidity_who.iloc[0]
     )