Review comments; remove outletT space.

bigladder · Dec 15, 2023 · 2e25a71 · 2e25a71
1 parent e3f4a7c
commit 2e25a71
Show file tree

Hide file tree

Showing 307 changed files with 310 additions and 318 deletions.
diff --git a/src/HPWH.cc b/src/HPWH.cc
@@ -63,10 +63,6 @@ const double HPWH::MAXOUTLET_R410A = F_TO_C(140.);
 const double HPWH::MAXOUTLET_R744 = F_TO_C(190.);
 const double HPWH::MINSINGLEPASSLIFT = dF_TO_dC(15.);
 
-double makeC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute){
-	return (units == HPWH::UNITS_C) ? T_F_or_C : (absolute ? F_TO_C(T_F_or_C) : dF_TO_dC(T_F_or_C));
-}
-
 //-----------------------------------------------------------------------------
 ///	@brief	Samples a std::vector to extract a single value spanning the fractional
 ///			coordinate range from frac_begin to frac_end. 
@@ -1746,7 +1742,7 @@ std::vector<HPWH::NodeWeight> HPWH::getNodeWeightRange(double bottomFraction, do
 
 std::shared_ptr<HPWH::TempBasedHeatingLogic> HPWH::wholeTank(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) {
 	std::vector<NodeWeight> nodeWeights = getNodeWeightRange(0., 1.);
-	double decisionPoint_C = makeC(decisionPoint,units,absolute);
+	double decisionPoint_C = convertTempToC(decisionPoint,units,absolute);
 	return std::make_shared<HPWH::TempBasedHeatingLogic>("whole tank",nodeWeights,decisionPoint_C,this,absolute);
 }
 
@@ -1762,7 +1758,7 @@ std::shared_ptr<HPWH::TempBasedHeatingLogic> HPWH::topThird_absolute(double deci
 
 std::shared_ptr<HPWH::TempBasedHeatingLogic> HPWH::secondThird(double decisionPoint,const UNITS units /* = UNITS_C */, const bool absolute /* = false */) {
 	std::vector<NodeWeight> nodeWeights = getNodeWeightRange(1./3., 2./3.);
-	double decisionPoint_C = makeC(decisionPoint,units,absolute);
+	double decisionPoint_C = convertTempToC(decisionPoint,units,absolute);
 	return std::make_shared<HPWH::TempBasedHeatingLogic>("second third",nodeWeights,decisionPoint_C,this,absolute);
 }
 
@@ -1816,11 +1812,6 @@ std::shared_ptr<HPWH::TempBasedHeatingLogic> HPWH::bottomTwelfth(double decision
 	return std::make_shared<HPWH::TempBasedHeatingLogic>("bottom twelfth",nodeWeights,decisionPoint,this);
 }
 
-std::shared_ptr<HPWH::TempBasedHeatingLogic> HPWH::bottomTwelfth_absolute(double decisionPoint) {
-	std::vector<NodeWeight> nodeWeights = getNodeWeightRange(0., 1./12.);
-	return std::make_shared<HPWH::TempBasedHeatingLogic>("bottom twelfth",nodeWeights,decisionPoint,this,true);
-}
-
 std::shared_ptr<HPWH::TempBasedHeatingLogic> HPWH::standby(double decisionPoint) {
 	std::vector<NodeWeight> nodeWeights;
 	nodeWeights.emplace_back(LOGIC_NODE_SIZE + 1); // uses very top computation node

diff --git a/src/HPWH.hh b/src/HPWH.hh
@@ -381,7 +381,6 @@ public:
 	std::shared_ptr<TempBasedHeatingLogic> bottomThird(double decisionPoint);
 	std::shared_ptr<TempBasedHeatingLogic> bottomHalf(double decisionPoint) ;
 	std::shared_ptr<TempBasedHeatingLogic> bottomTwelfth(double decisionPoint);
-	std::shared_ptr<TempBasedHeatingLogic> bottomTwelfth_absolute(double decisionPoint);
 	std::shared_ptr<TempBasedHeatingLogic> bottomSixth(double decisionPoint);
 	std::shared_ptr<TempBasedHeatingLogic> bottomSixth_absolute(double decisionPoint);
 	std::shared_ptr<TempBasedHeatingLogic> secondSixth(double decisionPoint);
@@ -1365,7 +1364,9 @@ inline HPWH::DRMODES operator|(HPWH::DRMODES a,HPWH::DRMODES b)
 template< typename T> inline bool aboutEqual(T a,T b) { return fabs(a - b) < HPWH::TOL_MINVALUE; }
 
 /// Generate an absolute or relative temperature in degC.
-double makeC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute);
+inline double convertTempToC(const double T_F_or_C,const HPWH::UNITS units,const bool absolute){
+	return (units == HPWH::UNITS_C) ? T_F_or_C : (absolute ? F_TO_C(T_F_or_C) : dF_TO_dC(T_F_or_C));
+}
 
 // resampling utility functions
 double getResampledValue(const std::vector<double> &values,double beginFraction,double endFraction);

diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc
@@ -3828,7 +3828,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) {
 
 		// heat exchangers only
 		hasHeatExchanger = true;
-		heatExchangerEffectiveness = 0.95;
+		heatExchangerEffectiveness = 0.93;
 
 		HeatSource compressor(this);
 

diff --git a/test/ref/test30_File_AOSmithHPTS50.csv b/test/ref/test30_File_AOSmithHPTS50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.99,52.99,52.99,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.81,47.45,52.42,52.98,52.98,52.98,52.99

diff --git a/test/ref/test30_File_AOSmithHPTU80.csv b/test/ref/test30_File_AOSmithHPTU80.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.92,51.78,52.99,52.99,52.99,52.99,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.81,49.78,52.79,52.98,52.98,52.98,52.99

diff --git a/test/ref/test30_File_AOSmithPHPT60.csv b/test/ref/test30_File_AOSmithPHPT60.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.30,52.99,52.99,52.99,52.99,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.57,48.55,52.62,52.98,52.98,52.98,52.99

diff --git a/test/ref/test30_File_GE502014.csv b/test/ref/test30_File_GE502014.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.32,50.85,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.98,52.98,52.98,52.98

diff --git a/test/ref/test30_File_Rheem2020Build50.csv b/test/ref/test30_File_Rheem2020Build50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_File_Rheem2020Prem40.csv b/test/ref/test30_File_Rheem2020Prem40.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.67,50.32,52.97,52.97,52.97,52.97,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,28.91,46.00,52.07,52.96,52.96,52.96,52.97

diff --git a/test/ref/test30_File_Rheem2020Prem50.csv b/test/ref/test30_File_Rheem2020Prem50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_File_RheemHB50.csv b/test/ref/test30_File_RheemHB50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.31,50.85,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_File_Sanden80.csv b/test/ref/test30_File_Sanden80.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 65.000000, 5.000000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99,
 1, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,56.34,64.99,64.99,64.99,64.99,64.99,64.99
 2, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,47.68,64.98,64.98,64.98,64.98,64.98,64.99

diff --git a/test/ref/test30_File_Stiebel220e.csv b/test/ref/test30_File_Stiebel220e.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,42.69,52.98,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,32.42,52.96,52.97,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_Preset_AOSmithHPTS50.csv b/test/ref/test30_Preset_AOSmithHPTS50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.46,50.88,52.98,52.99,52.99,52.99,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.81,47.45,52.42,52.98,52.98,52.98,52.99

diff --git a/test/ref/test30_Preset_AOSmithHPTU80.csv b/test/ref/test30_Preset_AOSmithHPTU80.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,46.92,51.78,52.99,52.99,52.99,52.99,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,41.81,49.78,52.79,52.98,52.98,52.98,52.99

diff --git a/test/ref/test30_Preset_AOSmithPHPT60.csv b/test/ref/test30_Preset_AOSmithPHPT60.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,44.56,51.30,52.99,52.99,52.99,52.99,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,37.57,48.55,52.62,52.98,52.98,52.98,52.99

diff --git a/test/ref/test30_Preset_GE502014.csv b/test/ref/test30_Preset_GE502014.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.32,50.85,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.98,52.98,52.98,52.98

diff --git a/test/ref/test30_Preset_Rheem2020Build50.csv b/test/ref/test30_Preset_Rheem2020Build50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_Preset_Rheem2020Prem40.csv b/test/ref/test30_Preset_Rheem2020Prem40.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.98,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,39.67,50.32,52.97,52.97,52.97,52.97,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,28.91,46.00,52.07,52.96,52.96,52.96,52.97

diff --git a/test/ref/test30_Preset_Rheem2020Prem50.csv b/test/ref/test30_Preset_Rheem2020Prem50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.33,50.86,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.59,47.38,52.40,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_Preset_RheemHB50.csv b/test/ref/test30_Preset_RheemHB50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,42.31,50.85,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,33.56,47.38,52.40,52.97,52.97,52.97,52.98

diff --git a/test/ref/test30_Preset_Sanden80.csv b/test/ref/test30_Preset_Sanden80.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 65.000000, 5.000000, 0.000000, 0,0.00,0.00,64.99,64.99,64.99,64.99,64.99,64.99,
 1, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,56.34,64.99,64.99,64.99,64.99,64.99,64.99
 2, 0.000000, 65.000000, 5.000000, 2.000000, 0,0.00,0.00,47.68,64.98,64.98,64.98,64.98,64.98,64.99

diff --git a/test/ref/test30_Preset_Stiebel220e.csv b/test/ref/test30_Preset_Stiebel220e.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 0.000000, 53.000000, 5.000000, 0.000000, 0,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,42.69,52.98,52.98,52.98,52.98,52.98,52.99
 2, 0.000000, 53.000000, 5.000000, 2.000000, 0,0.00,0.00,0.00,0.00,32.42,52.96,52.97,52.97,52.97,52.97,52.98

diff --git a/test/ref/test50_File_AOSmithHPTS50.csv b/test/ref/test50_File_AOSmithHPTS50.csv
@@ -1,4 +1,4 @@
-minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C), toutlet (C)
+minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In (Wh),h_src2Out (Wh),h_src3In (Wh),h_src3Out (Wh),tcouple1 (C),tcouple2 (C),tcouple3 (C),tcouple4 (C),tcouple5 (C),tcouple6 (C),toutlet (C)
 0, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.99,52.99,52.99,52.99,52.99,52.99,
 1, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,43.56,51.10,52.99,52.99,52.99,52.99,52.99
 2, 10.000000, 53.000000, 10.000000, 2.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,35.81,48.03,52.48,52.98,52.98,52.98,52.99