added some unit tests for different coefficients and input types

Author: kurt-rhee

pvlib/tests/conftest.py

@@ -477,19 +477,36 @@ def sapm_module_params():
 
 
 @pytest.fixture(scope='function')
-def tdew_rh_conversion_temperature():
+def tdew_from_rh_tamb():
     temperature = pd.Series([20.0, 25.0, 30.0, 15.0, 10.0])
     return temperature
 
 
 @pytest.fixture(scope='function')
-def tdew_rh_conversion_dewpoint():
+def tdew_from_rh_tdew():
     dewpoint = pd.Series([15.0, 20.0, 25.0, 12.0, 8.0])
     return dewpoint
 
 @pytest.fixture(scope='function')
-def tdew_rh_conversion_relative_humidity():
+def tdew_from_rh_tdew_aekr():
+    dewpoint = pd.Series([
+        15.002788636614607, 20.00273293813965, 25.002679259728964,
+        12.001714029144065, 8.0011690397714
+    ])
+    return dewpoint
+
+@pytest.fixture(scope='function')
+def tdew_from_rh_rh():
     relative_humidity = pd.Series([
-        72.938767, 73.802512, 74.628205, 82.261353, 87.383237
+        72.95185312581116, 73.81500029087906, 74.6401272083123,
+        82.27063889868842, 87.39018119185337
     ])
     return relative_humidity
+
+@pytest.fixture(scope='function')
+def tdew_from_rh_rh_aekr():
+   relative_humidity = pd.Series([
+       72.93876680928582, 73.8025121880607, 74.62820502423823,
+        82.26135295757305, 87.38323744820416
+   ])
+   return relative_humidity

pvlib/tests/test_atmosphere.py

@@ -82,47 +82,121 @@ def test_gueymard94_pw():
     pws = atmosphere.gueymard94_pw(temps_humids[:, 0], temps_humids[:, 1])
 
     expected = np.array(
-        [0.1       ,   0.33702061,   1.12340202,   0.1       ,
+        [  0.1       ,   0.33702061,   1.12340202,   0.1       ,
          1.12040963,   3.73469877,   0.1       ,   3.44859767,  11.49532557])
 
     assert_allclose(pws, expected, atol=0.01)
 
 
 # Unit tests
 def test_rh_from_tdew(
-    tdew_rh_conversion_temperature, tdew_rh_conversion_dewpoint,
-    tdew_rh_conversion_relative_humidity
+    tdew_from_rh_tamb, tdew_from_rh_tdew,
+    tdew_from_rh_tdew_aekr, tdew_from_rh_rh,
+    tdew_from_rh_rh_aekr
 ):
 
-    # Calculate relative humidity
-    rh = atmosphere.rh_from_tdew(
-        temperature=tdew_rh_conversion_temperature,
-        dewpoint=tdew_rh_conversion_dewpoint
+    # Calculate relative humidity using pandas series as input
+    rh_series = atmosphere.rh_from_tdew(
+        temperature=tdew_from_rh_tamb,
+        dewpoint=tdew_from_rh_tdew
+    )
+
+    # Calulate relative humidity using pandas series as input
+    # with AEKR coefficients
+    rh_series_aekr = atmosphere.rh_from_tdew(
+        temperature=tdew_from_rh_tamb,
+        dewpoint=tdew_from_rh_tdew,
+        coeff=(6.1094, 17.625, 243.04)
+    )
+
+    # Calculate relative humidity using array as input
+    rh_array = atmosphere.rh_from_tdew(
+        temperature=tdew_from_rh_tamb.to_numpy(),
+        dewpoint=tdew_from_rh_tdew.to_numpy()
+    )
+
+    # Calculate relative humidity using float as input
+    rh_float = atmosphere.rh_from_tdew(
+        temperature=tdew_from_rh_tamb.iloc[0],
+        dewpoint=tdew_from_rh_tdew.iloc[0]
     )
 
     # test
     pd.testing.assert_series_equal(
-        rh,
-        tdew_rh_conversion_relative_humidity,
+        rh_series,
+        tdew_from_rh_rh,
+        check_names=False
+    )
+
+    pd.testing.assert_series_equal(
+        rh_series_aekr,
+        tdew_from_rh_rh_aekr,
         check_names=False
     )
 
+    np.testing.assert_allclose(
+        rh_array,
+        tdew_from_rh_rh.to_numpy(),
+        atol=0.001
+    )
+
+    assert np.isclose(
+        rh_float,
+        tdew_from_rh_rh.iloc[0]
+    )
+
 
 # Unit tests
 def test_tdew_from_rh(
-    tdew_rh_conversion_temperature, tdew_rh_conversion_dewpoint,
-    tdew_rh_conversion_relative_humidity
+    tdew_from_rh_tamb, tdew_from_rh_tdew,
+    tdew_from_rh_rh, tdew_from_rh_rh_aekr,
+    tdew_from_rh_tdew_aekr
 ):
 
-    # Calculate relative humidity
-    dewpoint = atmosphere.tdew_from_rh(
-        temperature=tdew_rh_conversion_temperature,
-        relative_humidity=tdew_rh_conversion_relative_humidity
+    # test as series
+    dewpoint_series = atmosphere.tdew_from_rh(
+        temperature=tdew_from_rh_tamb,
+        relative_humidity=tdew_from_rh_rh
+    )
+
+    # test as series with AEKR coefficients
+    dewpoint_series_aekr = atmosphere.tdew_from_rh(
+        temperature=tdew_from_rh_tamb,
+        relative_humidity=tdew_from_rh_rh,
+        coeff=(6.1094, 17.625, 243.04)
+    )
+
+    # test as numpy array
+    dewpoint_array = atmosphere.tdew_from_rh(
+        temperature=tdew_from_rh_tamb.to_numpy(),
+        relative_humidity=tdew_from_rh_rh.to_numpy()
+    )
+
+    # test as float
+    dewpoint_float = atmosphere.tdew_from_rh(
+        temperature=tdew_from_rh_tamb.iloc[0],
+        relative_humidity=tdew_from_rh_rh.iloc[0]
     )
 
     # test
     pd.testing.assert_series_equal(
-        dewpoint, dewpoint, check_names=False
+        dewpoint_series, tdew_from_rh_tdew, check_names=False
+    )
+
+    pd.testing.assert_series_equal(
+        dewpoint_series_aekr, tdew_from_rh_tdew_aekr,
+        check_names=False
+    )
+
+    np.testing.assert_allclose(
+        dewpoint_array,
+        tdew_from_rh_tdew.to_numpy(),
+        atol=0.001
+    )
+
+    assert np.isclose(
+        dewpoint_float,
+        tdew_from_rh_tdew.iloc[0]
     )