Remove test code, format.

bigladder · Jan 4, 2024 · cdd5a20 · cdd5a20
1 parent 69dbe24
commit cdd5a20
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 32 deletions.
diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc
@@ -4516,27 +4516,27 @@ int HPWH::HPWHinit_presets(MODELS presetNum)
         compressor.perfMap.reserve(4);
 
         compressor.perfMap.push_back({
-            5,                       // Temperature (T_F)
-            {-1356, 39.80, 0.},      // Input Power Coefficients (inputPower_coeffs)
+            5,                     // Temperature (T_F)
+            {-1356, 39.80, 0.},    // Input Power Coefficients (inputPower_coeffs)
             {2.003, -0.003637, 0.} // COP Coefficients (COP_coeffs)
         });
 
         compressor.perfMap.push_back({
-            34,                      // Temperature (T_F)
-            {-1485, 43.60, 0.},      // Input Power Coefficients (inputPower_coeffs)
+            34,                    // Temperature (T_F)
+            {-1485, 43.60, 0.},    // Input Power Coefficients (inputPower_coeffs)
             {2.805, -0.005092, 0.} // COP Coefficients (COP_coeffs)
         });
 
         compressor.perfMap.push_back({
-            67,                      // Temperature (T_F)
-            {-1632, 47.93, 0.},      // Input Power Coefficients (inputPower_coeffs)
+            67,                    // Temperature (T_F)
+            {-1632, 47.93, 0.},    // Input Power Coefficients (inputPower_coeffs)
             {4.076, -0.007400, 0.} // COP Coefficients (COP_coeffs)
         });
 
         compressor.perfMap.push_back({
-            95,                      // Temperature (T_F)
-            {-1757, 51.60, 0.},      // Input Power Coefficients (inputPower_coeffs)
-            {6.843,-0.012424, 0.} // COP Coefficients (COP_coeffs)
+            95,                    // Temperature (T_F)
+            {-1757, 51.60, 0.},    // Input Power Coefficients (inputPower_coeffs)
+            {6.843, -0.012424, 0.} // COP Coefficients (COP_coeffs)
         });
 
         compressor.minT = F_TO_C(-25);

diff --git a/test/AquaThermAire.txt b/test/AquaThermAire.txt
@@ -27,35 +27,35 @@ heatsource 0 T4 95 F
 #quadratic terms for this product are zero. It's remarkably linear.
 
 #  5F Coefficients
-heatsource 0 inPowT1const -1423
-heatsource 0 inPowT1lin 38.70
+heatsource 0 inPowT1const -1356
+heatsource 0 inPowT1lin 39.80
 heatsource 0 inPowT1quad 0.0
-heatsource 0 copT1const -0.13839
-heatsource 0 copT1lin 0.012319
+heatsource 0 copT1const 2.003
+heatsource 0 copT1lin -0.003637
 heatsource 0 copT1quad 0.0
 
 # 34F Coefficients
-heatsource 0 inPowT2const -1558
-heatsource 0 inPowT2lin 42.40
+heatsource 0 inPowT2const -1485
+heatsource 0 inPowT2lin 43.60
 heatsource 0 inPowT2quad 0.0
-heatsource 0 copT2const -0.19375
-heatsource 0 copT2lin 0.017247
+heatsource 0 copT2const 2.805
+heatsource 0 copT2lin -0.005092
 heatsource 0 copT2quad 0.0
 
 # 67F Coefficients
-heatsource 0 inPowT3const -1713
-heatsource 0 inPowT3lin 46.60
+heatsource 0 inPowT3const -1632
+heatsource 0 inPowT3lin 47.93
 heatsource 0 inPowT3quad 0.0
-heatsource 0 copT3const -0.239326
-heatsource 0 copT3lin 0.02882
+heatsource 0 copT3const 4.076
+heatsource 0 copT3lin -0.007400
 heatsource 0 copT3quad 0.0
 
 # 95F Coefficients
-heatsource 0 inPowT4const -1844
-heatsource 0 inPowT4lin 50.17
+heatsource 0 inPowT4const -1757
+heatsource 0 inPowT4lin 51.60
 heatsource 0 inPowT4quad 0.0
-heatsource 0 copT4const -0.47273
-heatsource 0 copT4lin 0.042082
+heatsource 0 copT4const 6.843
+heatsource 0 copT4lin -0.012424
 heatsource 0 copT4quad 0.0
 
 

diff --git a/test/main.cc b/test/main.cc
@@ -364,8 +364,6 @@ int main(int argc, char* argv[])
     // ------------------------------------- Simulate --------------------------------------- //
     cout << "Now Simulating " << minutesToRun << " Minutes of the Test\n";
 
-    double powerInput_kJ = 0.;
-
     std::vector<double> nodeExtraHeat_W;
     std::vector<double>* vectptr = NULL;
     // Loop over the minutes in the test
@@ -434,10 +432,6 @@ int main(int argc, char* argv[])
             cout << "WARNING: On minute " << i << " HPWH has an energy balance error.\n";
         }
 
-        for (int iHS = 0; iHS < hpwh.getNumHeatSources(); iHS++) {
-            powerInput_kJ += hpwh.getNthHeatSourceEnergyInput(iHS, HPWH::UNITS_KJ);
-        }
-
         // Check timing
         for (int iHS = 0; iHS < hpwh.getNumHeatSources(); iHS++)
         {
@@ -529,7 +523,6 @@ int main(int argc, char* argv[])
     }
     controlFile.close();
 
-    std::cout << "Power Input (Wh): " << 1000. * KJ_TO_KWH(powerInput_kJ) << "\n";
     return 0;
 }