Format and test refs.

bigladder · Dec 26, 2023 · 215be38 · 215be38
1 parent 01dfb22
commit 215be38
Show file tree

Hide file tree

Showing 114 changed files with 7,650 additions and 7,650 deletions.
diff --git a/src/HPWH.cc b/src/HPWH.cc
@@ -51,8 +51,8 @@ using std::cout;
 using std::endl;
 using std::string;
 
-const double HPWH::DENSITYWATER_kgperL = 0.995;
-const double HPWH::KWATER_WpermC = 0.62;
+const double HPWH::DENSITYWATER_kgperL = 0.995; /// mass density of water
+const double HPWH::KWATER_WpermC = 0.62; /// thermal conductivity of water
 const double HPWH::cPWATER_kJperkgC = 4.180; /// specific heat capcity of water
 
 const double HPWH::TOL_MINVALUE = 0.0001;

diff --git a/src/HPWH.hh b/src/HPWH.hh
@@ -40,8 +40,8 @@ class HPWH
     static const int MAXOUTSTRING =
         200; /**< this is the maximum length for a debuging output string */
 
-    static const double DENSITYWATER_kgperL;
-    static const double KWATER_WpermC;
+    static const double DENSITYWATER_kgperL; /// mass density of water
+    static const double KWATER_WpermC; /// thermal conductivity of water
     static const double cPWATER_kJperkgC; /// specific heat capcity of water
     static const double TOL_MINVALUE; /**< any amount of heat distribution less than this is reduced
                                          to 0 this saves on computations */

diff --git a/src/HPWHHeatSources.cc b/src/HPWHHeatSources.cc
@@ -948,9 +948,9 @@ double HPWH::HeatSource::addHeatExternal(double externalT_C,
                                          double& cop)
 {
 
-    input_BTUperHr = 0;
-    cap_BTUperHr = 0;
-    cop = 0;
+    input_BTUperHr = 0.;
+    cap_BTUperHr = 0.;
+    cop = 0.;
 
     bool setPointExceeded = false;
     double maxTargetT_C = std::min(maxSetpoint_C, hpwh->setpoint_C);
@@ -1086,7 +1086,7 @@ double HPWH::HeatSource::addHeatExternal(double externalT_C,
         }
         // if there's still time remaining and you haven't heated to the cutoff
         // specified in shutsOff logic, keep heating
-    } while ((timeRemaining_min > 0) && (!shutsOff()) && (!setPointExceeded));
+    } while ((timeRemaining_min > 0.) && (!shutsOff()) && (!setPointExceeded));
 
     // divide outputs by sum of weight - the total time ran
     // not timeRemaining_min == minutesToRun is possible

diff --git a/test/main.cc b/test/main.cc
@@ -37,7 +37,7 @@ int main(int argc, char* argv[])
     // HPWH::CSVOPTIONS IP = HPWH::CSVOPT_IPUNITS; //  CSVOPT_NONE or  CSVOPT_IPUNITS
     //  HPWH::UNITS units = HPWH::UNITS_F;
 
-    const double EBALTHRESHOLD = 1.e-9;
+    const double EBALTHRESHOLD = 1.e-6;
 
     const int nTestTCouples = 6;
 

diff --git a/test/ref/DHW_YRLY.csv b/test/ref/DHW_YRLY.csv
@@ -6,38 +6,38 @@ testCA_3BR_CTZ15,Preset,Rheem2020Prem50,21934,21934,0,0,533295,2224941,555229,22
 testCA_3BR_CTZ15,Preset,Rheem2020Build50,18422,18422,0,0,616009,2241746,634431,2260168,1.00,-nan(ind),3.64,3.56
 testCA_3BR_CTZ15,Preset,RheemPlugInDedicated50,686585,2277144,0,0,0,0,686585,2277144,3.32,-nan(ind),-nan(ind),3.32
 testCA_3BR_CTZ15,Preset,RheemPlugInShared40,557168,2339586,0,0,0,0,557168,2339586,4.20,-nan(ind),-nan(ind),4.20
-testCA_3BR_CTZ15,Preset,RheemPlugInShared50,550351,2305883,0,0,0,0,550351,2305883,4.19,-nan(ind),-nan(ind),4.19
+testCA_3BR_CTZ15,Preset,RheemPlugInShared50,550351,2305884,0,0,0,0,550351,2305884,4.19,-nan(ind),-nan(ind),4.19
 testCA_3BR_CTZ15,Preset,AOSmithCAHP120,0,0,2475,2475,677748,2365264,680223,2367738,-nan(ind),1.00,3.49,3.48
 testCA_3BR_CTZ15,Preset,AWHSTier3Generic80,17550,17550,0,0,695306,2264199,712856,2281749,1.00,-nan(ind),3.26,3.20
 testCA_3BR_CTZ16,Preset,AOSmithHPTU80,6088,6088,1179534,1179534,690914,2297398,1876536,3483020,1.00,1.00,3.33,1.86
 testCA_3BR_CTZ16,Preset,Sanden80,1354799,4328117,0,0,0,0,1354799,4328117,3.19,-nan(ind),-nan(ind),3.19
-testCA_3BR_CTZ16,Preset,GE502014,130275,130275,353792,353792,898211,2756543,1382279,3240610,1.00,1.00,3.07,2.34
-testCA_3BR_CTZ16,Preset,Rheem2020Prem40,132342,132342,278799,278799,844628,3058799,1255769,3469941,1.00,1.00,3.62,2.76
-testCA_3BR_CTZ16,Preset,Rheem2020Prem50,89483,89483,279666,279666,842085,3042790,1211235,3411939,1.00,1.00,3.61,2.82
+testCA_3BR_CTZ16,Preset,GE502014,130275,130275,353792,353792,898211,2756543,1382279,3240611,1.00,1.00,3.07,2.34
+testCA_3BR_CTZ16,Preset,Rheem2020Prem40,132342,132342,278799,278799,844627,3058799,1255768,3469940,1.00,1.00,3.62,2.76
+testCA_3BR_CTZ16,Preset,Rheem2020Prem50,89483,89483,279666,279666,842085,3042790,1211235,3411940,1.00,1.00,3.61,2.82
 testCA_3BR_CTZ16,Preset,Rheem2020Build50,73993,73993,281985,281985,931391,3066657,1287370,3422636,1.00,1.00,3.29,2.66
 testCA_3BR_CTZ16,Preset,RheemPlugInDedicated50,1075466,3298078,0,0,0,0,1075466,3298078,3.07,-nan(ind),-nan(ind),3.07
 testCA_3BR_CTZ16,Preset,RheemPlugInShared40,902116,3357097,0,0,0,0,902116,3357097,3.72,-nan(ind),-nan(ind),3.72
 testCA_3BR_CTZ16,Preset,RheemPlugInShared50,905228,3337523,0,0,0,0,905228,3337523,3.69,-nan(ind),-nan(ind),3.69
 testCA_3BR_CTZ16,Preset,AOSmithCAHP120,0,0,1691018,1691018,540738,1798679,2231756,3489697,-nan(ind),1.00,3.33,1.56
 testCA_3BR_CTZ16,Preset,AWHSTier3Generic80,41850,41850,1063562,1063562,852285,2430196,1957697,3535608,1.00,1.00,2.85,1.81
-testCA_36Unit_CTZ12,Preset,QAHV_N136TAU_HPB_SP,25579199,96336852,0,0,0,0,25579199,96336852,3.77,-nan(ind),-nan(ind),3.77
-testCA_36Unit_CTZ12,Preset,ColmacCxV_5_SP,29810230,93675724,0,0,0,0,29810230,93675724,3.14,-nan(ind),-nan(ind),3.14
-testCA_36Unit_CTZ12,Preset,ColmacCxA_10_SP,29863357,97002089,0,0,0,0,29863357,97002089,3.25,-nan(ind),-nan(ind),3.25
-testCA_36Unit_CTZ12,Preset,ColmacCxA_15_SP,37099048,97207160,0,0,0,0,37099048,97207160,2.62,-nan(ind),-nan(ind),2.62
-testCA_36Unit_CTZ12,Preset,ColmacCxA_20_SP,32819045,97554042,0,0,0,0,32819045,97554042,2.97,-nan(ind),-nan(ind),2.97
-testCA_36Unit_CTZ12,Preset,ColmacCxA_25_SP,34181024,97826810,0,0,0,0,34181024,97826810,2.86,-nan(ind),-nan(ind),2.86
-testCA_36Unit_CTZ12,Preset,ColmacCxA_30_SP,34200636,98139446,0,0,0,0,34200636,98139446,2.87,-nan(ind),-nan(ind),2.87
-testCA_36Unit_CTZ12,Preset,NyleC60A_SP,30073563,94790929,0,0,0,0,30073563,94790929,3.15,-nan(ind),-nan(ind),3.15
-testCA_36Unit_CTZ12,Preset,NyleC90A_SP,29066682,96788017,0,0,0,0,29066682,96788017,3.33,-nan(ind),-nan(ind),3.33
-testCA_36Unit_CTZ12,Preset,NyleC185A_SP,29660784,97554366,0,0,0,0,29660784,97554366,3.29,-nan(ind),-nan(ind),3.29
-testCA_36Unit_CTZ12,Preset,NyleC250A_SP,25595635,97547619,0,0,0,0,25595635,97547619,3.81,-nan(ind),-nan(ind),3.81
-testCA_36Unit_CTZ12,Preset,ColmacCxV_5_MP,31681534,87668021,0,0,0,0,31681534,87668021,2.77,-nan(ind),-nan(ind),2.77
-testCA_36Unit_CTZ12,Preset,ColmacCxA_15_MP,44752575,95899338,0,0,0,0,44752575,95899338,2.14,-nan(ind),-nan(ind),2.14
-testCA_36Unit_CTZ12,Preset,ColmacCxA_20_MP,37878323,97052064,0,0,0,0,37878323,97052064,2.56,-nan(ind),-nan(ind),2.56
-testCA_36Unit_CTZ12,Preset,NyleC60A_MP,40596680,89031773,0,0,0,0,40596680,89031773,2.19,-nan(ind),-nan(ind),2.19
-testCA_36Unit_CTZ12,Preset,NyleC185A_MP,42455039,97451592,0,0,0,0,42455039,97451592,2.30,-nan(ind),-nan(ind),2.30
-testCA_36Unit_CTZ12,Preset,NyleC250A_MP,34266642,97496299,0,0,0,0,34266642,97496299,2.85,-nan(ind),-nan(ind),2.85
-testCA_36Unit_CTZ12,Preset,RheemHPHD60,25796227,87357476,0,0,0,0,25796227,87357476,3.39,-nan(ind),-nan(ind),3.39
-testCA_36Unit_CTZ12,Preset,RheemHPHD135,34754223,95520122,0,0,0,0,34754223,95520122,2.75,-nan(ind),-nan(ind),2.75
-testCA_36Unit_CTZ12,Preset,TamScalable_SP,1000,1000,0,0,43439261,110163246,43440261,110164246,1.00,-nan(ind),2.54,2.54
-testCA_36Unit_CTZ12,Preset,Scalable_MP,500,500,690532,690532,51124181,104342905,51815213,105033937,1.00,1.00,2.04,2.03
+testCA_36Unit_CTZ12,Preset,QAHV_N136TAU_HPB_SP,25579200,96336855,0,0,0,0,25579200,96336855,3.77,-nan(ind),-nan(ind),3.77
+testCA_36Unit_CTZ12,Preset,ColmacCxV_5_SP,29810230,93675727,0,0,0,0,29810230,93675727,3.14,-nan(ind),-nan(ind),3.14
+testCA_36Unit_CTZ12,Preset,ColmacCxA_10_SP,29863358,97002092,0,0,0,0,29863358,97002092,3.25,-nan(ind),-nan(ind),3.25
+testCA_36Unit_CTZ12,Preset,ColmacCxA_15_SP,37099049,97207163,0,0,0,0,37099049,97207163,2.62,-nan(ind),-nan(ind),2.62
+testCA_36Unit_CTZ12,Preset,ColmacCxA_20_SP,32819046,97554045,0,0,0,0,32819046,97554045,2.97,-nan(ind),-nan(ind),2.97
+testCA_36Unit_CTZ12,Preset,ColmacCxA_25_SP,34181025,97826814,0,0,0,0,34181025,97826814,2.86,-nan(ind),-nan(ind),2.86
+testCA_36Unit_CTZ12,Preset,ColmacCxA_30_SP,34200637,98139450,0,0,0,0,34200637,98139450,2.87,-nan(ind),-nan(ind),2.87
+testCA_36Unit_CTZ12,Preset,NyleC60A_SP,30073564,94790932,0,0,0,0,30073564,94790932,3.15,-nan(ind),-nan(ind),3.15
+testCA_36Unit_CTZ12,Preset,NyleC90A_SP,29066683,96788021,0,0,0,0,29066683,96788021,3.33,-nan(ind),-nan(ind),3.33
+testCA_36Unit_CTZ12,Preset,NyleC185A_SP,29660785,97554370,0,0,0,0,29660785,97554370,3.29,-nan(ind),-nan(ind),3.29
+testCA_36Unit_CTZ12,Preset,NyleC250A_SP,25595636,97547623,0,0,0,0,25595636,97547623,3.81,-nan(ind),-nan(ind),3.81
+testCA_36Unit_CTZ12,Preset,ColmacCxV_5_MP,31681533,87668022,0,0,0,0,31681533,87668022,2.77,-nan(ind),-nan(ind),2.77
+testCA_36Unit_CTZ12,Preset,ColmacCxA_15_MP,44752573,95899339,0,0,0,0,44752573,95899339,2.14,-nan(ind),-nan(ind),2.14
+testCA_36Unit_CTZ12,Preset,ColmacCxA_20_MP,37878322,97052065,0,0,0,0,37878322,97052065,2.56,-nan(ind),-nan(ind),2.56
+testCA_36Unit_CTZ12,Preset,NyleC60A_MP,40596679,89031774,0,0,0,0,40596679,89031774,2.19,-nan(ind),-nan(ind),2.19
+testCA_36Unit_CTZ12,Preset,NyleC185A_MP,42456282,97452095,0,0,0,0,42456282,97452095,2.30,-nan(ind),-nan(ind),2.30
+testCA_36Unit_CTZ12,Preset,NyleC250A_MP,34266642,97496301,0,0,0,0,34266642,97496301,2.85,-nan(ind),-nan(ind),2.85
+testCA_36Unit_CTZ12,Preset,RheemHPHD60,25796226,87357476,0,0,0,0,25796226,87357476,3.39,-nan(ind),-nan(ind),3.39
+testCA_36Unit_CTZ12,Preset,RheemHPHD135,34754222,95520123,0,0,0,0,34754222,95520123,2.75,-nan(ind),-nan(ind),2.75
+testCA_36Unit_CTZ12,Preset,TamScalable_SP,1000,1000,0,0,43439262,110163250,43440262,110164250,1.00,-nan(ind),2.54,2.54
+testCA_36Unit_CTZ12,Preset,Scalable_MP,1500,1500,783858,783858,51097190,104272566,51882547,105057923,1.00,1.00,2.04,2.02
diff --git a/test/ref/test30_File_AOSmithPHPT60.csv b/test/ref/test30_File_AOSmithPHPT60.csv
@@ -215,7 +215,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 213, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,9.32,11.74,15.54,18.95,28.11,32.92,38.63
 214, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,8.73,10.85,14.57,18.35,27.98,31.34,35.64
 215, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,8.23,10.07,13.60,17.65,27.77,30.23,33.33
-216, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.79,9.38,12.67,16.87,27.47,29.46,31.64
+216, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.79,9.38,12.67,16.87,27.46,29.46,31.64
 217, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.41,8.79,11.79,16.03,27.05,28.90,30.44
 218, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.09,8.28,10.97,15.15,26.54,28.45,29.60
 219, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,6.81,7.84,10.23,14.26,25.94,28.05,29.00

diff --git a/test/ref/test30_File_Sanden80.csv b/test/ref/test30_File_Sanden80.csv
@@ -374,7 +374,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1
 372, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,4.99,7.32,25.07,55.41,64.25,64.71,
 373, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.00,7.46,25.65,55.78,64.26,64.71,
 374, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.00,7.61,26.23,56.13,64.28,64.71,
-375, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.01,7.76,26.82,56.48,64.29,64.71,
+375, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.01,7.76,26.81,56.48,64.29,64.71,
 376, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.02,7.93,27.41,56.81,64.30,64.71,
 377, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.03,8.09,28.00,57.14,64.31,64.71,
 378, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.04,8.27,28.60,57.45,64.33,64.71,

diff --git a/test/ref/test30_Preset_AOSmithPHPT60.csv b/test/ref/test30_Preset_AOSmithPHPT60.csv
@@ -215,7 +215,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 213, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,9.32,11.74,15.54,18.95,28.11,32.92,38.63
 214, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,8.73,10.85,14.57,18.35,27.98,31.34,35.64
 215, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,8.23,10.07,13.60,17.65,27.77,30.23,33.33
-216, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.79,9.38,12.67,16.87,27.47,29.46,31.64
+216, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.79,9.38,12.67,16.87,27.46,29.46,31.64
 217, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.41,8.79,11.79,16.03,27.05,28.90,30.44
 218, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,7.09,8.28,10.97,15.15,26.54,28.45,29.60
 219, 0.000000, 53.000000, 5.000000, 2.000000, 0,70.83,70.83,0.00,0.00,0.00,0.00,6.81,7.84,10.23,14.26,25.94,28.05,29.00

diff --git a/test/ref/test30_Preset_Sanden80.csv b/test/ref/test30_Preset_Sanden80.csv
@@ -374,7 +374,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),tcouple1
 372, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,4.99,7.32,25.07,55.41,64.25,64.71,
 373, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.00,7.46,25.65,55.78,64.26,64.71,
 374, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.00,7.61,26.23,56.13,64.28,64.71,
-375, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.01,7.76,26.82,56.48,64.29,64.71,
+375, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.01,7.76,26.81,56.48,64.29,64.71,
 376, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.02,7.93,27.41,56.81,64.30,64.71,
 377, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.03,8.09,28.00,57.14,64.31,64.71,
 378, 0.000000, 65.000000, 5.000000, 0.000000, 0,22.75,68.35,5.04,8.27,28.60,57.45,64.33,64.71,

diff --git a/test/ref/test50_File_AOSmithHPTS50.csv b/test/ref/test50_File_AOSmithHPTS50.csv
@@ -420,7 +420,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 418, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.97,21.14,31.38,47.69,47.82,48.32,51.42,52.22,
 419, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.98,21.10,31.50,47.84,47.97,48.46,51.45,52.23,
 420, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.99,21.07,31.61,47.99,48.12,48.59,51.49,52.24,
-421, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.00,21.04,31.72,48.15,48.27,48.73,51.52,52.25,
+421, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.00,21.04,31.72,48.14,48.27,48.73,51.52,52.25,
 422, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.01,21.01,31.84,48.30,48.42,48.86,51.56,52.26,
 423, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.02,20.97,31.96,48.45,48.57,49.00,51.60,52.28,
 424, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.03,20.94,32.07,48.60,48.72,49.13,51.64,52.29,

diff --git a/test/ref/test50_File_Rheem2020Prem50.csv b/test/ref/test50_File_Rheem2020Prem50.csv
@@ -181,7 +181,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 179, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.25,22.31,18.44,19.29,20.80,24.20,52.32,52.82,
 180, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.26,22.30,18.63,19.47,20.97,24.36,52.28,52.81,
 181, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.26,22.29,18.82,19.65,21.14,24.52,52.25,52.80,
-182, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.27,22.27,19.01,19.83,21.31,24.68,52.21,52.79,
+182, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.27,22.27,19.00,19.83,21.31,24.68,52.21,52.79,
 183, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.28,22.26,19.19,20.02,21.48,24.83,52.17,52.78,
 184, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.28,22.25,19.38,20.20,21.65,24.99,52.14,52.77,
 185, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.29,22.23,19.57,20.38,21.81,25.15,52.10,52.76,

diff --git a/test/ref/test50_File_RheemHB50.csv b/test/ref/test50_File_RheemHB50.csv
@@ -404,7 +404,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 402, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,15.23,30.61,52.41,52.44,52.44,52.47,52.80,52.87,
 403, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,15.26,30.50,52.61,52.63,52.63,52.65,52.87,52.91,
 404, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,15.29,30.40,52.82,52.83,52.83,52.84,52.93,52.96,
-405, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,14.03,27.75,53.00,53.00,53.00,53.00,53.00,53.00,
+405, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,14.03,27.76,53.00,53.00,53.00,53.00,53.00,53.00,
 406, 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,
 407, 10.000000, 53.000000, 10.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,
 408, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,0.00,0.00,52.97,52.98,52.98,52.98,52.98,52.98,

diff --git a/test/ref/test50_File_Stiebel220e.csv b/test/ref/test50_File_Stiebel220e.csv
@@ -469,7 +469,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 467, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.22,26.00,0.00,0.00,29.80,45.13,45.38,45.57,45.82,45.89,
 468, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.22,25.97,0.00,0.00,29.88,45.24,45.49,45.67,45.92,45.98,
 469, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.23,25.95,0.00,0.00,29.96,45.35,45.60,45.78,46.02,46.08,
-470, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.24,25.92,0.00,0.00,30.04,45.47,45.71,45.88,46.12,46.18,
+470, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.24,25.92,0.00,0.00,30.04,45.47,45.70,45.88,46.12,46.18,
 471, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.25,25.89,0.00,0.00,30.12,45.58,45.81,45.99,46.22,46.28,
 472, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.25,25.87,0.00,0.00,30.20,45.69,45.92,46.09,46.32,46.37,
 473, 10.000000, 53.000000, 10.000000, 0.000000, 0,9.26,25.84,0.00,0.00,30.29,45.80,46.03,46.20,46.42,46.47,

diff --git a/test/ref/test50_Preset_AOSmithHPTS50.csv b/test/ref/test50_Preset_AOSmithHPTS50.csv
@@ -420,7 +420,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 418, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.97,21.14,31.38,47.69,47.82,48.32,51.42,52.22,
 419, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.98,21.10,31.50,47.84,47.97,48.46,51.45,52.23,
 420, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,5.99,21.07,31.61,47.99,48.12,48.59,51.49,52.24,
-421, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.00,21.04,31.72,48.15,48.27,48.73,51.52,52.25,
+421, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.00,21.04,31.72,48.14,48.27,48.73,51.52,52.25,
 422, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.01,21.01,31.84,48.30,48.42,48.86,51.56,52.26,
 423, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.02,20.97,31.96,48.45,48.57,49.00,51.60,52.28,
 424, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,6.03,20.94,32.07,48.60,48.72,49.13,51.64,52.29,

diff --git a/test/ref/test50_Preset_Rheem2020Prem50.csv b/test/ref/test50_Preset_Rheem2020Prem50.csv
@@ -181,7 +181,7 @@ minutes,Ta,Tsetpoint,inletT,draw,DRstatus,h_src1In (Wh),h_src1Out (Wh),h_src2In
 179, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.25,22.31,18.44,19.29,20.80,24.20,52.32,52.82,
 180, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.26,22.30,18.63,19.47,20.97,24.36,52.28,52.81,
 181, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.26,22.29,18.82,19.65,21.14,24.52,52.25,52.80,
-182, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.27,22.27,19.01,19.83,21.31,24.68,52.21,52.79,
+182, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.27,22.27,19.00,19.83,21.31,24.68,52.21,52.79,
 183, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.28,22.26,19.19,20.02,21.48,24.83,52.17,52.78,
 184, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.28,22.25,19.38,20.20,21.65,24.99,52.14,52.77,
 185, 10.000000, 53.000000, 10.000000, 0.000000, 0,0.00,0.00,0.00,0.00,4.29,22.23,19.57,20.38,21.81,25.15,52.10,52.76,