From 0ecc5858487338469ca2f274b0d8b549c427a60f Mon Sep 17 00:00:00 2001
From: Phil Ahrenkiel <Phil Ahrenkiel@DESKTOP-5PJG564>
Date: Mon, 11 Dec 2023 10:12:21 -0700
Subject: [PATCH] Merge hpwh-master; add dhwcalc change.

---
 src/dhwcalc.cpp | 7 ++++---
 vendor/HPWHsim  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/dhwcalc.cpp b/src/dhwcalc.cpp
index bccfafc54..4eb3a2f71 100644
--- a/src/dhwcalc.cpp
+++ b/src/dhwcalc.cpp
@@ -3730,9 +3730,10 @@ RC HPWHLINK::hw_DoSubhrTick(		// calcs for 1 tick
 	{
 		double qTXkWh = tk.wtk_qTX / BtuperkWh;
 		hw_qTX += qTXkWh;		// subhour total (kWh)
-		double qTXPwr			// tick power per node, W
-			= qTXkWh * 1000. / (hw_nQTXNodes * Top.tp_tickDurHr);
-		hw_pNodePowerExtra_W.assign(hw_nQTXNodes, qTXPwr);
+		double qTXPwr			// tick power (W)
+			= qTXkWh * 1000. / (Top.tp_tickDurHr);
+		hw_pNodePowerExtra_W = {qTXPwr, 0., 0., 0.}; // bottom 1/4 of tank
+
 		pNPX = &hw_pNodePowerExtra_W;
 	}
 	
diff --git a/vendor/HPWHsim b/vendor/HPWHsim
index df305f299..7ecc73e98 160000
--- a/vendor/HPWHsim
+++ b/vendor/HPWHsim
@@ -1 +1 @@
-Subproject commit df305f2998e68b5daccd38cef78575b926120087
+Subproject commit 7ecc73e988b8a7a3042c83334dcbbfe31ce3fec6