bigladder · nealkruis · Dec 12, 2023 · Dec 5, 2023 · Dec 8, 2023 · Dec 8, 2023
diff --git a/src/HPWH.cc b/src/HPWH.cc
@@ -921,7 +921,6 @@ void HPWH::printTankTemps() {
 	msg(ss.str().c_str());
 }
 
-
 // public members to write to CSV file
 int HPWH::WriteCSVHeading(FILE* outFILE,const char* preamble,int nTCouples,int options) const {
 
@@ -939,6 +938,8 @@ int HPWH::WriteCSVHeading(FILE* outFILE,const char* preamble,int nTCouples,int o
 		fprintf(outFILE,",tcouple%d (%s)",iTC + 1,doIP ? "F" : "C");
 	}
 
+	fprintf(outFILE,", toutlet (%s)",doIP ? "F" : "C");
+
 	fprintf(outFILE,"\n");
 
 	return 0;
@@ -961,6 +962,13 @@ int HPWH::WriteCSVRow(FILE* outFILE,const char* preamble,int nTCouples,int optio
 		fprintf(outFILE,",%0.2f",getNthSimTcouple(iTC + 1,nTCouples,doIP ? UNITS_F : UNITS_C));
 	}
 
+	if (options & HPWH::CSVOPT_IS_DRAWING) {
+		fprintf(outFILE,",%0.2f",doIP ? C_TO_F(outletTemp_C) : outletTemp_C);
+	}
+	else {
+		fprintf(outFILE,",");
+	}
+
 	fprintf(outFILE,"\n");
 
 	return 0;

diff --git a/src/HPWH.hh b/src/HPWH.hh
@@ -268,8 +268,9 @@ public:
 
 	/** specifies the unit type for outputs in the CSV file-s  */
 	enum CSVOPTIONS {
-		CSVOPT_NONE,
-		CSVOPT_IPUNITS
+		CSVOPT_NONE = 0,
+		CSVOPT_IPUNITS = 1 << 0,
+		CSVOPT_IS_DRAWING = 1 << 1
 	};
 
 	struct NodeWeight {
@@ -500,6 +501,7 @@ public:
 	void printTankTemps();
 	/**< this prints out all the node temps, kind of nicely formatted
 		does not use verbosity, as it is public and expected to be called only when needed  */
+
 	int WriteCSVHeading(FILE* outFILE,const char* preamble = "",int nTCouples = 6,int options = CSVOPT_NONE) const;
 	int WriteCSVRow(FILE* outFILE,const char* preamble = "",int nTCouples = 6,int options = CSVOPT_NONE) const;
 	/**< a couple of function to write the outputs to a file

diff --git a/test/main.cc b/test/main.cc
@@ -299,7 +299,8 @@ int main(int argc, char *argv[])
 	  if(useSoC){ 
 		  header += strHeadSoC;
 	  }
-	  hpwh.WriteCSVHeading(outputFile, header.c_str(), nTestTCouples, 0);
+	  int csvOptions = HPWH::CSVOPT_NONE;
+	  hpwh.WriteCSVHeading(outputFile, header.c_str(), nTestTCouples, csvOptions);
   }
 
   // ------------------------------------- Simulate --------------------------------------- //
@@ -393,7 +394,11 @@ int main(int argc, char *argv[])
 		  if (useSoC) {
 			  strPreamble += std::to_string(allSchedules[6][i]) + ", " + std::to_string(hpwh.getSoCFraction()) + ", ";
 		  }
-		  hpwh.WriteCSVRow(outputFile, strPreamble.c_str(), nTestTCouples, 0);
+		  int csvOptions = HPWH::CSVOPT_NONE;
+		  if (allSchedules[1][i] > 0.) {
+			csvOptions |= HPWH::CSVOPT_IS_DRAWING;
+		  }
+		  hpwh.WriteCSVRow(outputFile, strPreamble.c_str(), nTestTCouples, csvOptions);
 	  }
 	  else {
 	  		for (int iHS = 0; iHS < hpwh.getNumHeatSources(); iHS++) {

diff --git a/test/ref/test30_File_AOSmithHPTS50.csv b/test/ref/test30_File_AOSmithHPTS50.csv
diff --git a/test/ref/test30_File_AOSmithHPTU80.csv b/test/ref/test30_File_AOSmithHPTU80.csv
diff --git a/test/ref/test30_File_AOSmithPHPT60.csv b/test/ref/test30_File_AOSmithPHPT60.csv
diff --git a/test/ref/test30_File_GE502014.csv b/test/ref/test30_File_GE502014.csv
diff --git a/test/ref/test30_File_Rheem2020Build50.csv b/test/ref/test30_File_Rheem2020Build50.csv
diff --git a/test/ref/test30_File_Rheem2020Prem40.csv b/test/ref/test30_File_Rheem2020Prem40.csv
diff --git a/test/ref/test30_File_Rheem2020Prem50.csv b/test/ref/test30_File_Rheem2020Prem50.csv
diff --git a/test/ref/test30_File_RheemHB50.csv b/test/ref/test30_File_RheemHB50.csv
diff --git a/test/ref/test30_File_Sanden80.csv b/test/ref/test30_File_Sanden80.csv
diff --git a/test/ref/test30_File_Stiebel220e.csv b/test/ref/test30_File_Stiebel220e.csv
diff --git a/test/ref/test30_Preset_AOSmithHPTS50.csv b/test/ref/test30_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/test30_Preset_AOSmithHPTU80.csv b/test/ref/test30_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/test30_Preset_AOSmithPHPT60.csv b/test/ref/test30_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/test30_Preset_GE502014.csv b/test/ref/test30_Preset_GE502014.csv
diff --git a/test/ref/test30_Preset_Rheem2020Build50.csv b/test/ref/test30_Preset_Rheem2020Build50.csv
diff --git a/test/ref/test30_Preset_Rheem2020Prem40.csv b/test/ref/test30_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/test30_Preset_Rheem2020Prem50.csv b/test/ref/test30_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/test30_Preset_RheemHB50.csv b/test/ref/test30_Preset_RheemHB50.csv
diff --git a/test/ref/test30_Preset_Sanden80.csv b/test/ref/test30_Preset_Sanden80.csv
diff --git a/test/ref/test30_Preset_Stiebel220e.csv b/test/ref/test30_Preset_Stiebel220e.csv
diff --git a/test/ref/test50_File_AOSmithHPTS50.csv b/test/ref/test50_File_AOSmithHPTS50.csv
diff --git a/test/ref/test50_File_AOSmithHPTU80.csv b/test/ref/test50_File_AOSmithHPTU80.csv
diff --git a/test/ref/test50_File_AOSmithPHPT60.csv b/test/ref/test50_File_AOSmithPHPT60.csv
diff --git a/test/ref/test50_File_GE502014.csv b/test/ref/test50_File_GE502014.csv
diff --git a/test/ref/test50_File_Rheem2020Build50.csv b/test/ref/test50_File_Rheem2020Build50.csv
diff --git a/test/ref/test50_File_Rheem2020Prem40.csv b/test/ref/test50_File_Rheem2020Prem40.csv
diff --git a/test/ref/test50_File_Rheem2020Prem50.csv b/test/ref/test50_File_Rheem2020Prem50.csv
diff --git a/test/ref/test50_File_RheemHB50.csv b/test/ref/test50_File_RheemHB50.csv
diff --git a/test/ref/test50_File_Sanden80.csv b/test/ref/test50_File_Sanden80.csv
diff --git a/test/ref/test50_File_Stiebel220e.csv b/test/ref/test50_File_Stiebel220e.csv
diff --git a/test/ref/test50_Preset_AOSmithHPTS50.csv b/test/ref/test50_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/test50_Preset_AOSmithHPTU80.csv b/test/ref/test50_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/test50_Preset_AOSmithPHPT60.csv b/test/ref/test50_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/test50_Preset_GE502014.csv b/test/ref/test50_Preset_GE502014.csv
diff --git a/test/ref/test50_Preset_Rheem2020Build50.csv b/test/ref/test50_Preset_Rheem2020Build50.csv
diff --git a/test/ref/test50_Preset_Rheem2020Prem40.csv b/test/ref/test50_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/test50_Preset_Rheem2020Prem50.csv b/test/ref/test50_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/test50_Preset_RheemHB50.csv b/test/ref/test50_Preset_RheemHB50.csv
diff --git a/test/ref/test50_Preset_Sanden80.csv b/test/ref/test50_Preset_Sanden80.csv
diff --git a/test/ref/test50_Preset_Stiebel220e.csv b/test/ref/test50_Preset_Stiebel220e.csv
diff --git a/test/ref/test70_File_AOSmithHPTS50.csv b/test/ref/test70_File_AOSmithHPTS50.csv
diff --git a/test/ref/test70_File_AOSmithHPTU80.csv b/test/ref/test70_File_AOSmithHPTU80.csv
diff --git a/test/ref/test70_File_AOSmithPHPT60.csv b/test/ref/test70_File_AOSmithPHPT60.csv
diff --git a/test/ref/test70_File_GE502014.csv b/test/ref/test70_File_GE502014.csv
diff --git a/test/ref/test70_File_Rheem2020Build50.csv b/test/ref/test70_File_Rheem2020Build50.csv
diff --git a/test/ref/test70_File_Rheem2020Prem40.csv b/test/ref/test70_File_Rheem2020Prem40.csv
diff --git a/test/ref/test70_File_Rheem2020Prem50.csv b/test/ref/test70_File_Rheem2020Prem50.csv
diff --git a/test/ref/test70_File_RheemHB50.csv b/test/ref/test70_File_RheemHB50.csv
diff --git a/test/ref/test70_File_Sanden80.csv b/test/ref/test70_File_Sanden80.csv
diff --git a/test/ref/test70_File_Stiebel220e.csv b/test/ref/test70_File_Stiebel220e.csv
diff --git a/test/ref/test70_Preset_AOSmithHPTS50.csv b/test/ref/test70_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/test70_Preset_AOSmithHPTU80.csv b/test/ref/test70_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/test70_Preset_AOSmithPHPT60.csv b/test/ref/test70_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/test70_Preset_GE502014.csv b/test/ref/test70_Preset_GE502014.csv
diff --git a/test/ref/test70_Preset_Rheem2020Build50.csv b/test/ref/test70_Preset_Rheem2020Build50.csv
diff --git a/test/ref/test70_Preset_Rheem2020Prem40.csv b/test/ref/test70_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/test70_Preset_Rheem2020Prem50.csv b/test/ref/test70_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/test70_Preset_RheemHB50.csv b/test/ref/test70_Preset_RheemHB50.csv
diff --git a/test/ref/test70_Preset_Sanden80.csv b/test/ref/test70_Preset_Sanden80.csv
diff --git a/test/ref/test70_Preset_Stiebel220e.csv b/test/ref/test70_Preset_Stiebel220e.csv
diff --git a/test/ref/test95_File_AOSmithHPTS50.csv b/test/ref/test95_File_AOSmithHPTS50.csv
diff --git a/test/ref/test95_File_AOSmithHPTU80.csv b/test/ref/test95_File_AOSmithHPTU80.csv
diff --git a/test/ref/test95_File_AOSmithPHPT60.csv b/test/ref/test95_File_AOSmithPHPT60.csv
diff --git a/test/ref/test95_File_GE502014.csv b/test/ref/test95_File_GE502014.csv
diff --git a/test/ref/test95_File_Rheem2020Build50.csv b/test/ref/test95_File_Rheem2020Build50.csv
diff --git a/test/ref/test95_File_Rheem2020Prem40.csv b/test/ref/test95_File_Rheem2020Prem40.csv
diff --git a/test/ref/test95_File_Rheem2020Prem50.csv b/test/ref/test95_File_Rheem2020Prem50.csv
diff --git a/test/ref/test95_File_RheemHB50.csv b/test/ref/test95_File_RheemHB50.csv
diff --git a/test/ref/test95_File_Sanden80.csv b/test/ref/test95_File_Sanden80.csv
diff --git a/test/ref/test95_File_Stiebel220e.csv b/test/ref/test95_File_Stiebel220e.csv
diff --git a/test/ref/test95_Preset_AOSmithHPTS50.csv b/test/ref/test95_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/test95_Preset_AOSmithHPTU80.csv b/test/ref/test95_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/test95_Preset_AOSmithPHPT60.csv b/test/ref/test95_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/test95_Preset_GE502014.csv b/test/ref/test95_Preset_GE502014.csv
diff --git a/test/ref/test95_Preset_Rheem2020Build50.csv b/test/ref/test95_Preset_Rheem2020Build50.csv
diff --git a/test/ref/test95_Preset_Rheem2020Prem40.csv b/test/ref/test95_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/test95_Preset_Rheem2020Prem50.csv b/test/ref/test95_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/test95_Preset_RheemHB50.csv b/test/ref/test95_Preset_RheemHB50.csv
diff --git a/test/ref/test95_Preset_Sanden80.csv b/test/ref/test95_Preset_Sanden80.csv
diff --git a/test/ref/test95_Preset_Stiebel220e.csv b/test/ref/test95_Preset_Stiebel220e.csv
diff --git a/test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv b/test/ref/testDR_TOTLOR_File_AOSmithHPTS50.csv
diff --git a/test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv b/test/ref/testDR_TOTLOR_File_AOSmithHPTU80.csv
diff --git a/test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv b/test/ref/testDR_TOTLOR_File_AOSmithPHPT60.csv
diff --git a/test/ref/testDR_TOTLOR_File_GE502014.csv b/test/ref/testDR_TOTLOR_File_GE502014.csv
diff --git a/test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv b/test/ref/testDR_TOTLOR_File_Rheem2020Build50.csv
diff --git a/test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv b/test/ref/testDR_TOTLOR_File_Rheem2020Prem40.csv
diff --git a/test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv b/test/ref/testDR_TOTLOR_File_Rheem2020Prem50.csv
diff --git a/test/ref/testDR_TOTLOR_File_RheemHB50.csv b/test/ref/testDR_TOTLOR_File_RheemHB50.csv
diff --git a/test/ref/testDR_TOTLOR_File_Sanden80.csv b/test/ref/testDR_TOTLOR_File_Sanden80.csv
diff --git a/test/ref/testDR_TOTLOR_File_Stiebel220e.csv b/test/ref/testDR_TOTLOR_File_Stiebel220e.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv b/test/ref/testDR_TOTLOR_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv b/test/ref/testDR_TOTLOR_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv b/test/ref/testDR_TOTLOR_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_GE502014.csv b/test/ref/testDR_TOTLOR_Preset_GE502014.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv b/test/ref/testDR_TOTLOR_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv b/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv b/test/ref/testDR_TOTLOR_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_RheemHB50.csv b/test/ref/testDR_TOTLOR_Preset_RheemHB50.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_Sanden80.csv b/test/ref/testDR_TOTLOR_Preset_Sanden80.csv
diff --git a/test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv b/test/ref/testDR_TOTLOR_Preset_Stiebel220e.csv
diff --git a/test/ref/testDr_LO_File_AOSmithHPTS50.csv b/test/ref/testDr_LO_File_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_LO_File_AOSmithHPTU80.csv b/test/ref/testDr_LO_File_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_LO_File_AOSmithPHPT60.csv b/test/ref/testDr_LO_File_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_LO_File_GE502014.csv b/test/ref/testDr_LO_File_GE502014.csv
diff --git a/test/ref/testDr_LO_File_Rheem2020Build50.csv b/test/ref/testDr_LO_File_Rheem2020Build50.csv
diff --git a/test/ref/testDr_LO_File_Rheem2020Prem40.csv b/test/ref/testDr_LO_File_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_LO_File_Rheem2020Prem50.csv b/test/ref/testDr_LO_File_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_LO_File_RheemHB50.csv b/test/ref/testDr_LO_File_RheemHB50.csv
diff --git a/test/ref/testDr_LO_File_Sanden80.csv b/test/ref/testDr_LO_File_Sanden80.csv
diff --git a/test/ref/testDr_LO_File_Stiebel220e.csv b/test/ref/testDr_LO_File_Stiebel220e.csv
diff --git a/test/ref/testDr_LO_Preset_AOSmithHPTS50.csv b/test/ref/testDr_LO_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_LO_Preset_AOSmithHPTU80.csv b/test/ref/testDr_LO_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_LO_Preset_AOSmithPHPT60.csv b/test/ref/testDr_LO_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_LO_Preset_GE502014.csv b/test/ref/testDr_LO_Preset_GE502014.csv
diff --git a/test/ref/testDr_LO_Preset_Rheem2020Build50.csv b/test/ref/testDr_LO_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testDr_LO_Preset_Rheem2020Prem40.csv b/test/ref/testDr_LO_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_LO_Preset_Rheem2020Prem50.csv b/test/ref/testDr_LO_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_LO_Preset_RheemHB50.csv b/test/ref/testDr_LO_Preset_RheemHB50.csv
diff --git a/test/ref/testDr_LO_Preset_Sanden80.csv b/test/ref/testDr_LO_Preset_Sanden80.csv
diff --git a/test/ref/testDr_LO_Preset_Stiebel220e.csv b/test/ref/testDr_LO_Preset_Stiebel220e.csv
diff --git a/test/ref/testDr_TOO2_File_AOSmithHPTS50.csv b/test/ref/testDr_TOO2_File_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_TOO2_File_AOSmithHPTU80.csv b/test/ref/testDr_TOO2_File_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_TOO2_File_AOSmithPHPT60.csv b/test/ref/testDr_TOO2_File_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_TOO2_File_GE502014.csv b/test/ref/testDr_TOO2_File_GE502014.csv
diff --git a/test/ref/testDr_TOO2_File_Rheem2020Build50.csv b/test/ref/testDr_TOO2_File_Rheem2020Build50.csv
diff --git a/test/ref/testDr_TOO2_File_Rheem2020Prem40.csv b/test/ref/testDr_TOO2_File_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_TOO2_File_Rheem2020Prem50.csv b/test/ref/testDr_TOO2_File_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_TOO2_File_RheemHB50.csv b/test/ref/testDr_TOO2_File_RheemHB50.csv
diff --git a/test/ref/testDr_TOO2_File_Sanden80.csv b/test/ref/testDr_TOO2_File_Sanden80.csv
diff --git a/test/ref/testDr_TOO2_File_Stiebel220e.csv b/test/ref/testDr_TOO2_File_Stiebel220e.csv
diff --git a/test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv b/test/ref/testDr_TOO2_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv b/test/ref/testDr_TOO2_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv b/test/ref/testDr_TOO2_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_TOO2_Preset_GE502014.csv b/test/ref/testDr_TOO2_Preset_GE502014.csv
diff --git a/test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv b/test/ref/testDr_TOO2_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv b/test/ref/testDr_TOO2_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv b/test/ref/testDr_TOO2_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_TOO2_Preset_RheemHB50.csv b/test/ref/testDr_TOO2_Preset_RheemHB50.csv
diff --git a/test/ref/testDr_TOO2_Preset_Sanden80.csv b/test/ref/testDr_TOO2_Preset_Sanden80.csv
diff --git a/test/ref/testDr_TOO2_Preset_Stiebel220e.csv b/test/ref/testDr_TOO2_Preset_Stiebel220e.csv
diff --git a/test/ref/testDr_TOO_File_AOSmithHPTS50.csv b/test/ref/testDr_TOO_File_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_TOO_File_AOSmithHPTU80.csv b/test/ref/testDr_TOO_File_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_TOO_File_AOSmithPHPT60.csv b/test/ref/testDr_TOO_File_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_TOO_File_GE502014.csv b/test/ref/testDr_TOO_File_GE502014.csv
diff --git a/test/ref/testDr_TOO_File_Rheem2020Build50.csv b/test/ref/testDr_TOO_File_Rheem2020Build50.csv
diff --git a/test/ref/testDr_TOO_File_Rheem2020Prem40.csv b/test/ref/testDr_TOO_File_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_TOO_File_Rheem2020Prem50.csv b/test/ref/testDr_TOO_File_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_TOO_File_RheemHB50.csv b/test/ref/testDr_TOO_File_RheemHB50.csv
diff --git a/test/ref/testDr_TOO_File_Sanden80.csv b/test/ref/testDr_TOO_File_Sanden80.csv
diff --git a/test/ref/testDr_TOO_File_Stiebel220e.csv b/test/ref/testDr_TOO_File_Stiebel220e.csv
diff --git a/test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv b/test/ref/testDr_TOO_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv b/test/ref/testDr_TOO_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv b/test/ref/testDr_TOO_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_TOO_Preset_GE502014.csv b/test/ref/testDr_TOO_Preset_GE502014.csv
diff --git a/test/ref/testDr_TOO_Preset_Rheem2020Build50.csv b/test/ref/testDr_TOO_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv b/test/ref/testDr_TOO_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv b/test/ref/testDr_TOO_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_TOO_Preset_RheemHB50.csv b/test/ref/testDr_TOO_Preset_RheemHB50.csv
diff --git a/test/ref/testDr_TOO_Preset_Sanden80.csv b/test/ref/testDr_TOO_Preset_Sanden80.csv
diff --git a/test/ref/testDr_TOO_Preset_Stiebel220e.csv b/test/ref/testDr_TOO_Preset_Stiebel220e.csv
diff --git a/test/ref/testDr_TOT_File_AOSmithHPTS50.csv b/test/ref/testDr_TOT_File_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_TOT_File_AOSmithHPTU80.csv b/test/ref/testDr_TOT_File_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_TOT_File_AOSmithPHPT60.csv b/test/ref/testDr_TOT_File_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_TOT_File_GE502014.csv b/test/ref/testDr_TOT_File_GE502014.csv
diff --git a/test/ref/testDr_TOT_File_Rheem2020Build50.csv b/test/ref/testDr_TOT_File_Rheem2020Build50.csv
diff --git a/test/ref/testDr_TOT_File_Rheem2020Prem40.csv b/test/ref/testDr_TOT_File_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_TOT_File_Rheem2020Prem50.csv b/test/ref/testDr_TOT_File_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_TOT_File_RheemHB50.csv b/test/ref/testDr_TOT_File_RheemHB50.csv
diff --git a/test/ref/testDr_TOT_File_Sanden80.csv b/test/ref/testDr_TOT_File_Sanden80.csv
diff --git a/test/ref/testDr_TOT_File_Stiebel220e.csv b/test/ref/testDr_TOT_File_Stiebel220e.csv
diff --git a/test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv b/test/ref/testDr_TOT_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv b/test/ref/testDr_TOT_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv b/test/ref/testDr_TOT_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testDr_TOT_Preset_GE502014.csv b/test/ref/testDr_TOT_Preset_GE502014.csv
diff --git a/test/ref/testDr_TOT_Preset_Rheem2020Build50.csv b/test/ref/testDr_TOT_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv b/test/ref/testDr_TOT_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv b/test/ref/testDr_TOT_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/testDr_TOT_Preset_RheemHB50.csv b/test/ref/testDr_TOT_Preset_RheemHB50.csv
diff --git a/test/ref/testDr_TOT_Preset_Sanden80.csv b/test/ref/testDr_TOT_Preset_Sanden80.csv
diff --git a/test/ref/testDr_TOT_Preset_Stiebel220e.csv b/test/ref/testDr_TOT_Preset_Stiebel220e.csv
diff --git a/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv b/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_10_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_15_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_20_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_25_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxA_30_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv b/test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv
diff --git a/test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv b/test/ref/testLargeComp45_Preset_ColmacCxV_5_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv b/test/ref/testLargeComp45_Preset_NyleC185A_C_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC185A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC185A_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_C_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_MP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_MP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC250A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC250A_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC25A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC25A_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_C_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_MP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_MP.csv
diff --git a/test/ref/testLargeComp45_Preset_NyleC90A_SP.csv b/test/ref/testLargeComp45_Preset_NyleC90A_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv b/test/ref/testLargeComp45_Preset_QAHV_N136TAU_HPB_SP.csv
diff --git a/test/ref/testLargeComp45_Preset_RheemHPHD135.csv b/test/ref/testLargeComp45_Preset_RheemHPHD135.csv
diff --git a/test/ref/testLargeComp45_Preset_RheemHPHD60.csv b/test/ref/testLargeComp45_Preset_RheemHPHD60.csv
diff --git a/test/ref/testLargeComp45_Preset_TamScalable_SP_Half.csv b/test/ref/testLargeComp45_Preset_TamScalable_SP_Half.csv
diff --git a/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv b/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_10_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_15_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_20_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_25_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxA_30_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv b/test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv
diff --git a/test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv b/test/ref/testLargeComp60_Preset_ColmacCxV_5_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv b/test/ref/testLargeComp60_Preset_NyleC185A_C_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC185A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC185A_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_C_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_MP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_MP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC250A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC250A_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC25A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC25A_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_C_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_MP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_MP.csv
diff --git a/test/ref/testLargeComp60_Preset_NyleC90A_SP.csv b/test/ref/testLargeComp60_Preset_NyleC90A_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv b/test/ref/testLargeComp60_Preset_QAHV_N136TAU_HPB_SP.csv
diff --git a/test/ref/testLargeComp60_Preset_RheemHPHD135.csv b/test/ref/testLargeComp60_Preset_RheemHPHD135.csv
diff --git a/test/ref/testLargeComp60_Preset_RheemHPHD60.csv b/test/ref/testLargeComp60_Preset_RheemHPHD60.csv
diff --git a/test/ref/testLargeComp60_Preset_TamScalable_SP_Half.csv b/test/ref/testLargeComp60_Preset_TamScalable_SP_Half.csv
diff --git a/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv b/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_10_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_15_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_20_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_25_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxA_30_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv
diff --git a/test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv b/test/ref/testLargeCompHot_Preset_ColmacCxV_5_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC185A_C_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC185A_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_C_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC250A_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC25A_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_C_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv
diff --git a/test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv b/test/ref/testLargeCompHot_Preset_NyleC90A_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv b/test/ref/testLargeCompHot_Preset_QAHV_N136TAU_HPB_SP.csv
diff --git a/test/ref/testLargeCompHot_Preset_RheemHPHD135.csv b/test/ref/testLargeCompHot_Preset_RheemHPHD135.csv
diff --git a/test/ref/testLargeCompHot_Preset_RheemHPHD60.csv b/test/ref/testLargeCompHot_Preset_RheemHPHD60.csv
diff --git a/test/ref/testLargeCompHot_Preset_TamScalable_SP_Half.csv b/test/ref/testLargeCompHot_Preset_TamScalable_SP_Half.csv
diff --git a/test/ref/testLockout_File_AOSmithHPTU80.csv b/test/ref/testLockout_File_AOSmithHPTU80.csv
diff --git a/test/ref/testLockout_File_AOSmithPHPT60.csv b/test/ref/testLockout_File_AOSmithPHPT60.csv
diff --git a/test/ref/testLockout_File_GE502014.csv b/test/ref/testLockout_File_GE502014.csv
diff --git a/test/ref/testLockout_File_RheemHB50.csv b/test/ref/testLockout_File_RheemHB50.csv
diff --git a/test/ref/testLockout_File_Stiebel220e.csv b/test/ref/testLockout_File_Stiebel220e.csv
diff --git a/test/ref/testLockout_Preset_AOSmithHPTU80.csv b/test/ref/testLockout_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testLockout_Preset_AOSmithPHPT60.csv b/test/ref/testLockout_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testLockout_Preset_GE502014.csv b/test/ref/testLockout_Preset_GE502014.csv
diff --git a/test/ref/testLockout_Preset_RheemHB50.csv b/test/ref/testLockout_Preset_RheemHB50.csv
diff --git a/test/ref/testLockout_Preset_Stiebel220e.csv b/test/ref/testLockout_Preset_Stiebel220e.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv b/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_AOSmithHPTU80.csv b/test/ref/testREGoesTo93CCold_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_GE502014.csv b/test/ref/testREGoesTo93CCold_Preset_GE502014.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_Rheem2020Build50.csv b/test/ref/testREGoesTo93CCold_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv b/test/ref/testREGoesTo93CCold_Preset_RheemHB50.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv b/test/ref/testREGoesTo93CCold_Preset_Stiebel220e.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_TamScalable_SP.csv b/test/ref/testREGoesTo93CCold_Preset_TamScalable_SP.csv
diff --git a/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv b/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv b/test/ref/testREGoesTo93C_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testREGoesTo93C_Preset_GE502014.csv b/test/ref/testREGoesTo93C_Preset_GE502014.csv
diff --git a/test/ref/testREGoesTo93C_Preset_Rheem2020Build50.csv b/test/ref/testREGoesTo93C_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testREGoesTo93C_Preset_RheemHB50.csv b/test/ref/testREGoesTo93C_Preset_RheemHB50.csv
diff --git a/test/ref/testREGoesTo93C_Preset_Stiebel220e.csv b/test/ref/testREGoesTo93C_Preset_Stiebel220e.csv
diff --git a/test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv b/test/ref/testREGoesTo93C_Preset_TamScalable_SP.csv
diff --git a/test/ref/testSandenCombi_File_AOSmithHPTS50.csv b/test/ref/testSandenCombi_File_AOSmithHPTS50.csv
diff --git a/test/ref/testSandenCombi_File_AOSmithHPTU80.csv b/test/ref/testSandenCombi_File_AOSmithHPTU80.csv
diff --git a/test/ref/testSandenCombi_File_AOSmithPHPT60.csv b/test/ref/testSandenCombi_File_AOSmithPHPT60.csv
diff --git a/test/ref/testSandenCombi_File_GE502014.csv b/test/ref/testSandenCombi_File_GE502014.csv
diff --git a/test/ref/testSandenCombi_File_Rheem2020Build50.csv b/test/ref/testSandenCombi_File_Rheem2020Build50.csv
diff --git a/test/ref/testSandenCombi_File_Rheem2020Prem40.csv b/test/ref/testSandenCombi_File_Rheem2020Prem40.csv
diff --git a/test/ref/testSandenCombi_File_Rheem2020Prem50.csv b/test/ref/testSandenCombi_File_Rheem2020Prem50.csv
diff --git a/test/ref/testSandenCombi_File_RheemHB50.csv b/test/ref/testSandenCombi_File_RheemHB50.csv
diff --git a/test/ref/testSandenCombi_File_Sanden80.csv b/test/ref/testSandenCombi_File_Sanden80.csv
diff --git a/test/ref/testSandenCombi_File_Stiebel220e.csv b/test/ref/testSandenCombi_File_Stiebel220e.csv
diff --git a/test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv b/test/ref/testSandenCombi_Preset_AOSmithHPTS50.csv
diff --git a/test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv b/test/ref/testSandenCombi_Preset_AOSmithHPTU80.csv
diff --git a/test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv b/test/ref/testSandenCombi_Preset_AOSmithPHPT60.csv
diff --git a/test/ref/testSandenCombi_Preset_GE502014.csv b/test/ref/testSandenCombi_Preset_GE502014.csv
diff --git a/test/ref/testSandenCombi_Preset_Rheem2020Build50.csv b/test/ref/testSandenCombi_Preset_Rheem2020Build50.csv
diff --git a/test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv b/test/ref/testSandenCombi_Preset_Rheem2020Prem40.csv
diff --git a/test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv b/test/ref/testSandenCombi_Preset_Rheem2020Prem50.csv
diff --git a/test/ref/testSandenCombi_Preset_RheemHB50.csv b/test/ref/testSandenCombi_Preset_RheemHB50.csv
diff --git a/test/ref/testSandenCombi_Preset_Sanden80.csv b/test/ref/testSandenCombi_Preset_Sanden80.csv
diff --git a/test/ref/testSandenCombi_Preset_Stiebel220e.csv b/test/ref/testSandenCombi_Preset_Stiebel220e.csv
diff --git a/test/ref/testSoC70_Preset_NyleC25A_SP.csv b/test/ref/testSoC70_Preset_NyleC25A_SP.csv