diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc index 4e2cbc71..e536412c 100644 --- a/src/HPWHpresets.cc +++ b/src/HPWHpresets.cc @@ -4517,26 +4517,26 @@ int HPWH::HPWHinit_presets(MODELS presetNum) compressor.perfMap.push_back({ 5, // Temperature (T_F) - {-1423, 38.70, 0.}, // Input Power Coefficients (inputPower_coeffs) - {-0.13839, 0.012319, 0.} // COP Coefficients (COP_coeffs) + {-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) - {-1558, 42.40, 0.}, // Input Power Coefficients (inputPower_coeffs) - {-0.19375, 0.017247, 0.} // COP Coefficients (COP_coeffs) + {-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) - {-1713, 46.60, 0.}, // Input Power Coefficients (inputPower_coeffs) - {-0.239326, 0.02882, 0.} // COP Coefficients (COP_coeffs) + {-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) - {-1844, 50.17, 0.}, // Input Power Coefficients (inputPower_coeffs) - {-0.47273, 0.042082, 0.} // COP Coefficients (COP_coeffs) + {-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/main.cc b/test/main.cc index 9a69b580..09479c12 100644 --- a/test/main.cc +++ b/test/main.cc @@ -364,6 +364,8 @@ int main(int argc, char* argv[]) // ------------------------------------- Simulate --------------------------------------- // cout << "Now Simulating " << minutesToRun << " Minutes of the Test\n"; + double powerInput_kJ = 0.; + std::vector nodeExtraHeat_W; std::vector* vectptr = NULL; // Loop over the minutes in the test @@ -432,6 +434,10 @@ 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++) { @@ -523,6 +529,7 @@ int main(int argc, char* argv[]) } controlFile.close(); + std::cout << "Power Input (Wh): " << 1000. * KJ_TO_KWH(powerInput_kJ) << "\n"; return 0; }