Refine BW coeffs.

bigladder · Dec 9, 2024 · ba2de39 · ba2de39
1 parent 4ef38fc
commit ba2de39
Show file tree

Hide file tree

Showing 11 changed files with 8,317 additions and 8,317 deletions.
diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc
@@ -4449,15 +4449,15 @@ void HPWH::initPreset(MODELS presetNum)
         compressor->perfMap.reserve(2);
 
         compressor->perfMap.push_back({
-            50,                 // Temperature (T_F)
-            {148, 2.0, 0.0},    // Input Power Coefficients (inputPower_coeffs)
-            {5.88, -0.024, 0.0} // COP Coefficients (COP_coeffs)
+            50,                // Temperature (T_F)
+            {120, 2.45, 0.0},  // Input Power Coefficients (inputPower_coeffs)
+            {6.3, -0.030, 0.0} // COP Coefficients (COP_coeffs)
         });
 
         compressor->perfMap.push_back({
-            70,                 // Temperature (T_F)
-            {110, 2.5, 0.0},    // Input Power Coefficients (inputPower_coeffs)
-            {6.8, -0.0323, 0.0} // COP Coefficients (COP_coeffs)
+            70,                // Temperature (T_F)
+            {124, 2.45, 0.0},  // Input Power Coefficients (inputPower_coeffs)
+            {6.8, -0.030, 0.0} // COP Coefficients (COP_coeffs)
         });
 
         compressor->minT = F_TO_C(37.0);
@@ -4480,7 +4480,7 @@ void HPWH::initPreset(MODELS presetNum)
 
         resistiveElementBottom->addShutOffLogic(bottomTwelfthMaxTemp(F_TO_C(86.1)));
 
-        compressor->addTurnOnLogic(bottomThird(dF_TO_dC(30)));
+        compressor->addTurnOnLogic(bottomThird(dF_TO_dC(25)));
         compressor->addTurnOnLogic(standby(dF_TO_dC(12.392)));
 
         //

diff --git a/...ighVolumeDrawTest50/measurements_test.csv → ...ermRE2H/HighVolumeDrawTest50/measured.csv b/...ighVolumeDrawTest50/measurements_test.csv → ...ermRE2H/HighVolumeDrawTest50/measured.csv
diff --git a/test/BradfordWhiteAeroThermRE2H50.txt b/test/BradfordWhiteAeroThermRE2H50.txt
@@ -65,19 +65,19 @@ heatsource 2 condensity 1 0 0
 
 heatsource 2 nTemps 2
 heatsource 2 T1 50 F
-heatsource 2 inPowT1const 148
-heatsource 2 inPowT1lin 2
+heatsource 2 inPowT1const 120
+heatsource 2 inPowT1lin 2.45
 heatsource 2 inPowT1quad 0
-heatsource 2 copT1const 5.88
-heatsource 2 copT1lin -0.024
+heatsource 2 copT1const 6.3
+heatsource 2 copT1lin -0.030
 heatsource 2 copT1quad 0.0
 
 heatsource 2 T2 70 F
-heatsource 2 inPowT2const 110
-heatsource 2 inPowT2lin 2.5
+heatsource 2 inPowT2const 124
+heatsource 2 inPowT2lin 2.45
 heatsource 2 inPowT2quad 0
 heatsource 2 copT2const 6.8
-heatsource 2 copT2lin -0.0323
+heatsource 2 copT2lin -0.030
 heatsource 2 copT2quad 0.0
 
 heatsource 2 minT 37 F
@@ -90,7 +90,7 @@ heatsource 0 onlogic fourthSixth 32 F
 
 heatsource 1 offlogic bottomTwelfthMaxTemp 86.1 F
 
-heatsource 2 onlogic bottomThird 30 F
+heatsource 2 onlogic bottomThird 25 F
 heatsource 2 onlogic standby 12.392 F
 
 #relative

diff --git a/test/BradfordWhiteAeroThermRE2H65.txt b/test/BradfordWhiteAeroThermRE2H65.txt
@@ -65,19 +65,19 @@ heatsource 2 condensity 1 0 0
 
 heatsource 2 nTemps 2
 heatsource 2 T1 50 F
-heatsource 2 inPowT1const 148
-heatsource 2 inPowT1lin 2
+heatsource 2 inPowT1const 120
+heatsource 2 inPowT1lin 2.45
 heatsource 2 inPowT1quad 0
-heatsource 2 copT1const 5.88
-heatsource 2 copT1lin -0.024
+heatsource 2 copT1const 6.3
+heatsource 2 copT1lin -0.030
 heatsource 2 copT1quad 0.0
 
 heatsource 2 T2 70 F
-heatsource 2 inPowT2const 110
-heatsource 2 inPowT2lin 2.5
+heatsource 2 inPowT2const 124
+heatsource 2 inPowT2lin 2.45
 heatsource 2 inPowT2quad 0
 heatsource 2 copT2const 6.8
-heatsource 2 copT2lin -0.0323
+heatsource 2 copT2lin -0.030
 heatsource 2 copT2quad 0.0
 
 heatsource 2 minT 37 F
@@ -90,7 +90,7 @@ heatsource 0 onlogic fourthSixth 32 F
 
 heatsource 1 offlogic bottomTwelfthMaxTemp 86.1 F
 
-heatsource 2 onlogic bottomThird 30 F
+heatsource 2 onlogic bottomThird 25 F
 heatsource 2 onlogic standby 12.392 F
 
 #relative

diff --git a/test/BradfordWhiteAeroThermRE2H80.txt b/test/BradfordWhiteAeroThermRE2H80.txt
@@ -65,19 +65,19 @@ heatsource 2 condensity 1 0 0
 
 heatsource 2 nTemps 2
 heatsource 2 T1 50 F
-heatsource 2 inPowT1const 148
-heatsource 2 inPowT1lin 2
+heatsource 2 inPowT1const 120
+heatsource 2 inPowT1lin 2.45
 heatsource 2 inPowT1quad 0
-heatsource 2 copT1const 5.88
-heatsource 2 copT1lin -0.024
+heatsource 2 copT1const 6.3
+heatsource 2 copT1lin -0.030
 heatsource 2 copT1quad 0.0
 
 heatsource 2 T2 70 F
-heatsource 2 inPowT2const 110
-heatsource 2 inPowT2lin 2.5
+heatsource 2 inPowT2const 124
+heatsource 2 inPowT2lin 2.45
 heatsource 2 inPowT2quad 0
 heatsource 2 copT2const 6.8
-heatsource 2 copT2lin -0.0323
+heatsource 2 copT2lin -0.030
 heatsource 2 copT2quad 0.0
 
 heatsource 2 minT 37 F
@@ -90,7 +90,7 @@ heatsource 0 onlogic fourthSixth 32 F
 
 heatsource 1 offlogic bottomTwelfthMaxTemp 86.1 F
 
-heatsource 2 onlogic bottomThird 30 F
+heatsource 2 onlogic bottomThird 25 F
 heatsource 2 onlogic standby 12.392 F
 
 #relative

diff --git a/test/ref/RE2H50_UEF50_Preset_BradfordWhiteAeroThermRE2H50.csv b/test/ref/RE2H50_UEF50_Preset_BradfordWhiteAeroThermRE2H50.csv
diff --git a/test/ref/RE2H50_UEF67_Preset_BradfordWhiteAeroThermRE2H50.csv b/test/ref/RE2H50_UEF67_Preset_BradfordWhiteAeroThermRE2H50.csv
diff --git a/test/ref/RE2H65_UEF50_Preset_BradfordWhiteAeroThermRE2H65.csv b/test/ref/RE2H65_UEF50_Preset_BradfordWhiteAeroThermRE2H65.csv
diff --git a/test/ref/RE2H65_UEF67_Preset_BradfordWhiteAeroThermRE2H65.csv b/test/ref/RE2H65_UEF67_Preset_BradfordWhiteAeroThermRE2H65.csv
diff --git a/test/ref/RE2H80_UEF50_Preset_BradfordWhiteAeroThermRE2H80.csv b/test/ref/RE2H80_UEF50_Preset_BradfordWhiteAeroThermRE2H80.csv
diff --git a/test/ref/RE2H80_UEF67_Preset_BradfordWhiteAeroThermRE2H80.csv b/test/ref/RE2H80_UEF67_Preset_BradfordWhiteAeroThermRE2H80.csv