Skip to content

Commit

Permalink
Refine LG coeffs; configure tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
spahrenk committed Dec 9, 2024
1 parent ba2de39 commit c01d5cb
Show file tree
Hide file tree
Showing 7 changed files with 5,315 additions and 5,310 deletions.
18 changes: 9 additions & 9 deletions src/HPWHpresets.cc
Original file line number Diff line number Diff line change
Expand Up @@ -4516,21 +4516,21 @@ void HPWH::initPreset(MODELS presetNum)
compressor->perfMap.reserve(3);

compressor->perfMap.push_back({
50, // Temperature (F)
{128, 1.7, 0.}, // Input Power Coefficients (kW)
{3.5, 0, 0.} // COP Coefficients
50, // Temperature (F)
{100, 1.9, 0.}, // Input Power Coefficients (kW)
{13.8, -0.10, 0.} // COP Coefficients
});

compressor->perfMap.push_back({
67.5, // Temperature (F)
{26., 1.8, 0.}, // Input Power Coefficients (kW)
{9.5, -0.05, 0.} // COP Coefficients
67.5, // Temperature (F)
{14., 1.9, 0.}, // Input Power Coefficients (kW)
{14.8, -0.10, 0.} // COP Coefficients
});

compressor->perfMap.push_back({
95, // Temperature (F)
{-31.81, 2.309, 0.}, // Input Power Coefficients (kW)
{20.29913, -0.1329, 0.} // COP Coefficients
95, // Temperature (F)
{0., 1.9, 0.}, // Input Power Coefficients (kW)
{16.9, -0.10, 0.} // COP Coefficients
});

compressor->minT = F_TO_C(23);
Expand Down
5 changes: 5 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,11 @@ foreach (size ${BradfordWhiteAeroThermRE2HSizes})
endforeach (test)
endforeach (size)

#Test(s) specifically for Bradford White AeroTherm model
foreach (test ${LG_APHWC50_Tests})
add_regression_test(TEST_NAME "${test}" MODEL_NAME "LG_APHWC50" SPEC_TYPE "Preset")
endforeach (test)

#Test models follow control logic with max temperatures.
foreach (test ${maxTempTests})
foreach (model ${maxTempModels})
Expand Down
24 changes: 12 additions & 12 deletions test/LG_APHWC50.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,28 @@ heatsource 2 T1 50 F
heatsource 2 T2 67.5 F
heatsource 2 T3 95 F

heatsource 2 inPowT1const 128
heatsource 2 inPowT1lin 1.7
heatsource 2 inPowT1const 100
heatsource 2 inPowT1lin 1.9
heatsource 2 inPowT1quad 0

heatsource 2 copT1const 3.5
heatsource 2 copT1lin 0
heatsource 2 copT1const 13.8
heatsource 2 copT1lin -0.10
heatsource 2 copT1quad 0

heatsource 2 inPowT2const 26
heatsource 2 inPowT2lin 1.8
heatsource 2 inPowT2const 14
heatsource 2 inPowT2lin 1.9
heatsource 2 inPowT2quad 0

heatsource 2 copT2const 9.5
heatsource 2 copT2lin -0.05
heatsource 2 copT2const 14.8
heatsource 2 copT2lin -0.10
heatsource 2 copT2quad 0.0

heatsource 2 inPowT3const -31.81
heatsource 2 inPowT3lin 2.309
heatsource 2 inPowT3const 0
heatsource 2 inPowT3lin 1.9
heatsource 2 inPowT3quad 0

heatsource 2 copT3const 20.29913
heatsource 2 copT3lin -0.1329
heatsource 2 copT3const 16.9
heatsource 2 copT3lin -0.10
heatsource 2 copT3quad 0.0

heatsource 2 minT 23 F
Expand Down
2,858 changes: 1,429 additions & 1,429 deletions test/ref/DOE2014_LGC50_24hr50_Preset_LG_APHWC50.csv

Large diffs are not rendered by default.

2,858 changes: 1,429 additions & 1,429 deletions test/ref/DOE2014_LGC50_24hr67_Preset_LG_APHWC50.csv

Large diffs are not rendered by default.

2,870 changes: 1,435 additions & 1,435 deletions test/ref/DOE2014_LGC50_24hr95_Preset_LG_APHWC50.csv

Large diffs are not rendered by default.

1,992 changes: 996 additions & 996 deletions test/ref/DP_LGC50_HVT_Preset_LG_APHWC50.csv

Large diffs are not rendered by default.

0 comments on commit c01d5cb

Please sign in to comment.