Fix Conflicts, Remove Debuging Code

bigladder · Feb 6, 2020 · 315f0bb · 315f0bb
1 parent b241070
commit 315f0bb
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 20 deletions.
diff --git a/src/HPWH.cc b/src/HPWH.cc
@@ -2502,14 +2502,14 @@ void HPWH::calcSizeConstants() {
 }
 
 void HPWH::calcDerivedValues() {
-	static char outputString[MAXOUTSTRING];  //this is used for debugging outputs
-
 	// tank node density (number of calculation nodes per regular node)
 	nodeDensity = numNodes / 12;
 
 	// condentropy/shrinkage and lowestNode are now in calcDerivedHeatingValues()
 	calcDerivedHeatingValues();
 
+	calcSizeConstants();
+
 	//heat source ability to depress temp
 	for (int i = 0; i < numHeatSources; i++) {
 		if (setOfSources[i].typeOfHeatSource == TYPE_compressor) {
@@ -2607,7 +2607,6 @@ void HPWH::calcDerivedHeatingValues(){
 		}
 	}
 
-	calcSizeConstants();
 }
 
 

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,20 +13,20 @@ set(testNames
   test30
   test50
   test70
-  #test95
- # testLockout
- # testDr
+  test95
+  testLockout
+  testDr
   testSandenCombi
 )
 
 set(modelNames
-  StorageTank
+#  StorageTank
   AOSmithPHPT60
   AOSmithHPTU80
-#  Sanden80
-#  RheemHB50
-#  Stiebel220e
-  #GE502014
+  Sanden80
+  RheemHB50
+  Stiebel220e
+  GE502014
 )
 
 set(lockoutTestModels

diff --git a/test/main.cc b/test/main.cc
@@ -60,7 +60,8 @@ int main(int argc, char *argv[])
   ifstream controlFile;
 
   string strPreamble;
-  string strHead = "minutes,Ta,inletT,draw,outletT";
+  // string strHead = "minutes,Ta,inletT,draw,outletT,";
+  string strHead = "minutes,Ta,inletT,draw,";
 
   //.......................................
   //process command line arguments
@@ -278,12 +279,6 @@ int main(int argc, char *argv[])
       drStatus = HPWH::DR_ENGAGE;
     }
 
-//	vectptr = NULL;
-//	if ( i == 15 || i== 16 || i== 17){
-//		nodeExtraHeat_W = {200000 };
-	//	vectptr = &nodeExtraHeat_W;
-	//}
-
     // Run the step
 	hpwh.runOneStep(allSchedules[0][i], // Inlet water temperature (C)
 		GAL_TO_L(allSchedules[1][i]), // Flow in gallons
@@ -300,8 +295,8 @@ int main(int argc, char *argv[])
     }
 
 	strPreamble = std::to_string(i) + ", " + std::to_string(airTemp2) + ", " +
-		std::to_string(allSchedules[0][i]) + ", " + std::to_string(allSchedules[1][i]) + ", " +
-		std::to_string(hpwh.getOutletTemp()) + ",";
+		std::to_string(allSchedules[0][i]) + ", " + std::to_string(allSchedules[1][i]) + ", ";// +
+		//std::to_string(hpwh.getOutletTemp()) + ",";
 	hpwh.WriteCSVRow(outputFile, strPreamble.c_str(), nTestTCouples, 0);
   }