Merge hpwh-master; add dhwcalc change.

cse-sim · Dec 11, 2023 · 0ecc585 · 0ecc585
1 parent bddde1e
commit 0ecc585
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
+204 −76		src/HPWH.cc
+23 −21		src/HPWH.hh
+16 −113		src/HPWHHeatSources.cc
+10 −19		src/HPWHpresets.cc
+16 −3		test/main.cc
+1 −1		test/test30/testInfo.txt
+1 −1		test/testEnergyBalance.cc