set default tempering valve to off

NREL · Aug 29, 2024 · f099d2a · f099d2a
1 parent 49350c6
commit f099d2a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 30 deletions.
diff --git a/ochre/Models/Water.py b/ochre/Models/Water.py
@@ -72,10 +72,12 @@ def __init__(self, water_nodes=12, water_vol_fractions=None, **kwargs):
         self.mains_temp = 0  # water mains temperature, in C
         self.outlet_temp = 0  # temperature of outlet water, in C
 
-        # mixed temperature (i.e. target temperature) setpoint for fixtures - Sink/Shower/Bath (SSB)
-        self.tempered_draw_temp = kwargs.get('Mixed Delivery Temperature (C)', convert(105, 'degF', 'degC'))
-        self.hot_draw_temp = kwargs.get('Tempering Valve Setpoint (C)', convert(125, 'degF', 'degC'))
-        self.setpoint_temp = kwargs.get('Setpoint Temperature (C)', convert(125, 'degF', 'degC'))
+        # target draw temperature setpoint for fixtures - Sink/Shower/Bath (SSB)
+        self.fixture_draw_temp = kwargs.get('Mixed Delivery Temperature (C)', convert(105, 'degF', 'degC'))
+
+        # target draw temperature for CW and DW
+        # use WH tempering valve setpoint or set to None
+        self.hot_draw_temp = kwargs.get('Tempering Valve Setpoint (C)')
         # Removing target temperature for clothes washers
         # self.washer_draw_temp = kwargs.get('Clothes Washer Delivery Temperature (C)', convert(92.5, 'degF', 'degC'))
 
@@ -150,29 +152,18 @@ def update_water_draw(self):
         if self.mains_temp is None:
             raise ModelException('Mains temperature required when water draw exists')
 
-        # calculate total draw volume from tempered draw volume(s)
-        # for tempered draw, assume outlet temperature == T1, slightly off if the water draw is very large
-        if self.tempered_draw_temp < self.setpoint_temp:
-            if self.outlet_temp <= self.hot_draw_temp:
-                self.draw_total = draw_hot
-            else:
-                vol_ratio_hot = (self.hot_draw_temp - self.mains_temp) / (self.outlet_temp - self.mains_temp)
-                self.draw_total += draw_hot * vol_ratio_hot
-        else:
-            self.draw_total = draw_hot
-
-        if draw_tempered:
-            if self.outlet_temp <= self.tempered_draw_temp:
-                self.draw_total += draw_tempered
-            else:
-                vol_ratio = (self.tempered_draw_temp - self.mains_temp) / (self.outlet_temp - self.mains_temp)
-                self.draw_total += draw_tempered * vol_ratio
-        # if draw_cw:
-        #     if self.outlet_temp <= self.washer_draw_temp:
-        #         self.draw_total += draw_cw
-        #     else:
-        #         vol_ratio = (self.washer_draw_temp - self.mains_temp) / (self.outlet_temp - self.mains_temp)
-        #         self.draw_total += draw_cw * vol_ratio
+        # calculate total draw volume from tempered and hot draw volume(s)
+        # for tempered draws, assume outlet temperature == T_WH1, slightly off if the water draw is very large
+        if self.outlet_temp > self.fixture_draw_temp:
+            vol_ratio = (self.fixture_draw_temp - self.mains_temp) / (self.outlet_temp - self.mains_temp)
+            draw_tempered *= vol_ratio
+            # draw_showers *= vol_ratio  # no impact on model or results
+
+        if self.hot_draw_temp is not None and self.outlet_temp > self.hot_draw_temp:
+            vol_ratio = (self.hot_draw_temp - self.mains_temp) / (self.outlet_temp - self.mains_temp)
+            draw_hot *= vol_ratio
+
+        self.draw_total = draw_tempered + draw_hot
 
         t_s = self.time_res.total_seconds()
         draw_liters = self.draw_total * t_s / 60  # in liters
@@ -228,7 +219,7 @@ def update_water_draw(self):
 
         # calculate unmet loads, showers only, in W
         self.h_unmet_load = max(
-            draw_showers / 60 * water_c * (self.tempered_draw_temp - self.outlet_temp), 0
+            draw_showers / 60 * water_c * (self.fixture_draw_temp - self.outlet_temp), 0
         )  # in W
 
         return heats_to_model

diff --git a/test/test_models/test_water.py b/test/test_models/test_water.py
@@ -97,7 +97,7 @@ def test_update_water_draw(self):
         self.assertLess(result[0], 0)
 
         # Tempered water draw - low setpoint
-        self.model.tempered_draw_temp = 40
+        self.model.fixture_draw_temp = 40
         result = self.model.update_water_draw(update_args_tempered_draw)
         self.assertLess(self.model.draw_total, 1)
         self.assertAlmostEqual(self.model.h_delivered, 2091.5, places=0)
@@ -106,7 +106,7 @@ def test_update_water_draw(self):
 
         # Tempered water draw - high setpoint
         self.model.states[0] = 55  # reset state
-        self.model.tempered_draw_temp = 60
+        self.model.fixture_draw_temp = 60
         self.model.update_water_draw(update_args_tempered_draw)
         self.assertEqual(self.model.draw_total, 1)
         self.assertAlmostEqual(self.model.h_unmet_load, 348.6, places=1)