Merge pull request #143 from EcotopeResearch/UpdateCAHP

Update CAHP120 UA
bigladder · Apr 19, 2022 · 7859bcd · 7859bcd
2 parents 094fd14 + 77c1dad
commit 7859bcd
Show file tree

Hide file tree

Showing 7 changed files with 2,123 additions and 2,123 deletions.
diff --git a/src/HPWHpresets.cc b/src/HPWHpresets.cc
@@ -2307,7 +2307,7 @@ int HPWH::HPWHinit_presets(MODELS presetNum) {
 	setpoint_C = F_TO_C(150.0);
 
 	tankVolume_L = GAL_TO_L(111.76); // AOSmith docs say 111.76
-	tankUA_kJperHrC = UAf_TO_UAc(11.8);
+	tankUA_kJperHrC = UAf_TO_UAc(3.94);
 
 	doTempDepression = false;
 	tankMixesOnDraw = false;

diff --git a/test/ref/DHW_YRLY.csv b/test/ref/DHW_YRLY.csv
@@ -4,15 +4,15 @@ testCA_3BR_CTZ15,Preset,GE502014,54225,54225,0,0,565950,2073625,620175,2127850,1
 testCA_3BR_CTZ15,Preset,Rheem2020Prem40,43371,43371,0,0,535535,2236502,578907,2279873,1.00,-nan(ind),4.18,3.94
 testCA_3BR_CTZ15,Preset,Rheem2020Prem50,21045,21045,0,0,534171,2227866,555216,2248911,1.00,-nan(ind),4.17,4.05
 testCA_3BR_CTZ15,Preset,Rheem2020Build50,18379,18379,0,0,616984,2244684,635363,2263063,1.00,-nan(ind),3.64,3.56
-testCA_3BR_CTZ15,Preset,AOSmithCAHP120,0,0,3751,3751,966044,3292274,969795,3296025,-nan(ind),1.00,3.41,3.40
+testCA_3BR_CTZ15,Preset,AOSmithCAHP120,0,0,3782,3782,667129,2331833,670911,2335615,-nan(ind),1.00,3.50,3.48
 testCA_3BR_CTZ15,Preset,AWHSTier3Generic80,14550,14550,0,0,709857,2306940,724407,2321490,1.00,-nan(ind),3.25,3.20
 testCA_3BR_CTZ16,Preset,AOSmithHPTU80,6217,6217,1209785,1209785,695488,2306965,1911490,3522967,1.00,1.00,3.32,1.84
 testCA_3BR_CTZ16,Preset,Sanden80,1348977,4310485,0,0,0,0,1348977,4310485,3.20,-nan(ind),-nan(ind),3.20
 testCA_3BR_CTZ16,Preset,GE502014,128925,128925,361015,361015,895456,2748143,1385395,3238083,1.00,1.00,3.07,2.34
 testCA_3BR_CTZ16,Preset,Rheem2020Prem40,132435,132435,278735,278735,840898,3044944,1252067,3456113,1.00,1.00,3.62,2.76
 testCA_3BR_CTZ16,Preset,Rheem2020Prem50,89165,89165,278913,278913,844319,3047099,1212397,3415177,1.00,1.00,3.61,2.82
 testCA_3BR_CTZ16,Preset,Rheem2020Build50,73729,73729,282475,282475,933398,3070491,1289603,3426695,1.00,1.00,3.29,2.66
-testCA_3BR_CTZ16,Preset,AOSmithCAHP120,0,0,2401225,2401225,792162,2552483,3193387,4953708,-nan(ind),1.00,3.22,1.55
+testCA_3BR_CTZ16,Preset,AOSmithCAHP120,0,0,1674400,1674400,534114,1777983,2208514,3452383,-nan(ind),1.00,3.33,1.56
 testCA_3BR_CTZ16,Preset,AWHSTier3Generic80,36150,36150,1039787,1039787,884426,2511693,1960363,3587630,1.00,1.00,2.84,1.83
 testCA_36Unit_CTZ12,Preset,QAHV_N136TAU_HPB_SP,23907442,96329721,0,0,0,0,23907442,96329721,4.03,-nan(ind),-nan(ind),4.03
 testCA_36Unit_CTZ12,Preset,ColmacCxV_5_SP,29754710,93544593,0,0,0,0,29754710,93544593,3.14,-nan(ind),-nan(ind),3.14

diff --git a/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv b/test/ref/testLargeComp45_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv b/test/ref/testLargeComp60_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv b/test/ref/testLargeCompHot_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv b/test/ref/testREGoesTo93CCold_Preset_AOSmithCAHP120.csv
diff --git a/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv b/test/ref/testREGoesTo93C_Preset_AOSmithCAHP120.csv