Merge pull request #234 from UW-Hydro/develop

Develop
UW-Hydro · Jul 31, 2020 · d805d05 · d805d05
2 parents 9411752 + 26d76c1
commit d805d05
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/docs/configuration.rst b/docs/configuration.rst
@@ -239,9 +239,9 @@ to the default after issuing a warning):
    - ``C`` (default)
    - ``K``
  * vapor_pressure
-   - ``kPa`` (default)
+   - ``Pa`` (default)
    - ``hPa``
-   - ``Pa``
+   - ``KPa``
  * air_pressure
    - ``kPa`` (default)
    - ``hPa``

diff --git a/docs/data.rst b/docs/data.rst
@@ -89,7 +89,7 @@ step:
 * ``t_min`` : Minimum temperature (also a required input value) (C)
 * ``t_max`` : Maximum temperature (also a required input value) (C)
 * ``prec`` : Precipitation (also a required input value) (mm/day)
-* ``vapor_pressure`` : Vapor pressure (kPa)
+* ``vapor_pressure`` : Vapor pressure (Pa)
 * ``shortwave`` : Shortwave radiation (W/m^2)
 * ``tskc`` : Cloud cover fraction
 * ``pet`` : Potential evapotranpiration (mm/day)
@@ -125,7 +125,7 @@ The following variables (and name conventions) are allowed to be specified for s
 * ``temp`` : Temperature (C)
 * ``prec`` : Precipitation (mm/timestep)
 * ``shortwave`` : Shortwave radiation (W/m^2)
-* ``vapor_pressure`` : Vapor pressure (kPa)
+* ``vapor_pressure`` : Vapor pressure (Pa)
 * ``air_pressure`` : Air pressure (kPa)
 * ``rel_humid`` : Relative humidity
 * ``spec_humid`` : Specific humidity

diff --git a/docs/whats-new.rst b/docs/whats-new.rst
@@ -5,6 +5,14 @@ What's New
 
 .. _whats-new.2.3.0:
 
+v2.3.1
+------
+
+Bug fixes
+~~~~~~~~~
+- Fixed an error in unit conversions for vapor pressure
+- Fixed documentation on vapor pressure units
+
 v2.3.0
 ------
 Enchancements

diff --git a/metsim/disaggregate.py b/metsim/disaggregate.py
@@ -469,9 +469,9 @@ def specific_humidity(vapor_pressure: np.array,
     Parameters
     ----------
     vapor_pressure:
-        A sub-daily timeseries of vapor pressure (kPa)
+        A sub-daily timeseries of vapor pressure (Pa)
     air_pressure:
-        A sub-daily timeseries of air pressure (kPa)
+        A sub-daily timeseries of air pressure (Pa)
 
     Returns
     -------

diff --git a/metsim/metsim.py b/metsim/metsim.py
@@ -92,7 +92,7 @@
          'temp': {'units': 'C', 'long_name': 'air temperature',
                   'standard_name': 'air_temperature',
                   'missing_value': np.nan, 'fill_value': np.nan},
-         'vapor_pressure': {'units': 'kPa', 'long_name': 'vapor pressure',
+         'vapor_pressure': {'units': 'Pa', 'long_name': 'vapor pressure',
                             'standard_name': 'vapor_pressure',
                             'missing_value': np.nan, 'fill_value': np.nan},
          'air_pressure': {'units': 'kPa', 'long_name': 'air pressure',

diff --git a/metsim/units.py b/metsim/units.py
@@ -30,9 +30,9 @@
             'K': lambda x, ts: x + 273.15,
             },
         'vapor_pressure': {
-            'kPa': lambda x, ts: x,
-            'hPa': lambda x, ts: x * 100.,
-            'Pa': lambda x, ts: x * 1000.,
+            'Pa': lambda x, ts: x,
+            'hPa': lambda x, ts: x / 100.,
+            'kPa': lambda x, ts: x / 1000.,
             },
         'air_pressure': {
             'kPa': lambda x, ts: x,