From 8cb8c223f80c58f35047b024d564cacca1307117 Mon Sep 17 00:00:00 2001 From: Elizabeth Clark Date: Wed, 30 Mar 2016 19:18:02 +0000 Subject: [PATCH 1/2] added m to mm conversion in mm/d calculation --- rvic/core/history.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rvic/core/history.py b/rvic/core/history.py index d559159..d8c14b9 100644 --- a/rvic/core/history.py +++ b/rvic/core/history.py @@ -22,7 +22,7 @@ from .time_utility import ord_to_datetime from logging import getLogger from .log import LOG_NAME -from .share import SECSPERDAY, HOURSPERDAY, TIMEUNITS +from .share import SECSPERDAY, HOURSPERDAY, TIMEUNITS, MMPERMETER from .share import NC_INT, NC_FLOAT, NC_CHAR from .share import NC_DOUBLE, WATERDENSITY, MONTHSPERYEAR from .pycompat import iteritems @@ -120,6 +120,7 @@ def __init__(self, time_ord, caseid, rvar, tape_num=0, self._units_mult = grid_area[self._outlet_y_ind, self._outlet_x_ind] self._units_mult *= SECSPERDAY + self._units_mult *= MMPERMETER self._units_mult /= WATERDENSITY self._units_mult /= self._outlet_upstream_area elif units in ['gal/day', 'gpd', 'gal d-1']: From c85690f81a90b5e7cf51292b7a33d4971071801b Mon Sep 17 00:00:00 2001 From: Elizabeth Clark Date: Wed, 30 Mar 2016 19:57:52 +0000 Subject: [PATCH 2/2] removed unnecessary calculations and added documentation to describe constants that cancel --- rvic/core/history.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rvic/core/history.py b/rvic/core/history.py index d8c14b9..d0c428d 100644 --- a/rvic/core/history.py +++ b/rvic/core/history.py @@ -22,7 +22,7 @@ from .time_utility import ord_to_datetime from logging import getLogger from .log import LOG_NAME -from .share import SECSPERDAY, HOURSPERDAY, TIMEUNITS, MMPERMETER +from .share import SECSPERDAY, HOURSPERDAY, TIMEUNITS from .share import NC_INT, NC_FLOAT, NC_CHAR from .share import NC_DOUBLE, WATERDENSITY, MONTHSPERYEAR from .pycompat import iteritems @@ -120,8 +120,8 @@ def __init__(self, time_ord, caseid, rvar, tape_num=0, self._units_mult = grid_area[self._outlet_y_ind, self._outlet_x_ind] self._units_mult *= SECSPERDAY - self._units_mult *= MMPERMETER - self._units_mult /= WATERDENSITY + # divide by water density (1000 kg/m3) and multiply by + # 1000 mm/m gives 1 mm * m2 / kg self._units_mult /= self._outlet_upstream_area elif units in ['gal/day', 'gpd', 'gal d-1']: self._units_mult = grid_area[self._outlet_y_ind,