update to track v0.27 of upstream

communitiesuk · Apr 10, 2024 · 0a3433e · 0a3433e
1 parent 4a54519
commit 0a3433e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hem"
-version = "0.25.0-alpha"
+version = "0.27.0-alpha"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/src/core/water_heat_demand/shower.rs b/src/core/water_heat_demand/shower.rs
@@ -81,8 +81,11 @@ impl MixerShower {
             vol_warm_water * frac_hot_water(temp_target, self.temp_hot, temp_cold);
 
         if let Some(wwhrs) = &mut self.wwhrs {
+            // Assumed temperature entering WWHRS
+            let temp_drain = 35.0;
+
             let wwhrs_return_temperature =
-                wwhrs.return_temperature(temp_target, self.flowrate, timestep_idx);
+                wwhrs.return_temperature(temp_drain, self.flowrate, timestep_idx);
             match wwhrs {
                 Wwhrs::WWHRSInstantaneousSystemB(_) => {
                     vol_hot_water = vol_warm_water