diff --git a/doc/src/records/dhwheater-doc.md b/doc/src/records/dhwheater-doc.md index a495085c7..529a06d3a 100644 --- a/doc/src/records/dhwheater-doc.md +++ b/doc/src/records/dhwheater-doc.md @@ -312,6 +312,10 @@ Air source heat pump type, valid only if whHeatSrc=ASHPX. These choices are supp "AOSmithSHPT50","50 gal AOSmith SHPT" "AOSmithSHPT66","66 gal AOSmith SHPT" "AOSmithSHPT80","80 gal AOSmith SHPT" +"AOSmithHPTS40","40 gal AOSmith HPTS" +"AOSmithHPTS50","50 gal AOSmith HPTS" +"AOSmithHPTS66","66 gal AOSmith HPTS" +"AOSmithHPTS80","80 gal AOSmith HPTS" "ColmacCxV5_SP","Colmac CxA-xx modular external HPWHs (single pass mode)" "ColmacCxA10_SP","Colmac CxA-xx modular external HPWHs (single pass mode)" "ColmacCxA15_SP","Colmac CxA-xx modular external HPWHs (single pass mode)" @@ -351,12 +355,16 @@ Air source heat pump type, valid only if whHeatSrc=ASHPX. These choices are supp "Rheem_HPHD135VNU_MP","Rheem HPHD135 MP external MP HPWHs" "Scalable_SP","single pass scalable type for autosized standard design" "Scalable_MP","multipass scalable type for autosized standard design" -"AquaThermAire","Vallara AquaThermAire HPWH" +"AquaThermAire","Villara AquaThermAire HPWH" "GenericUEF217","65-gal tank meeting Federal standard minimum requirement" "AWHSTier4Generic40","Any 40-gal tank meeting Advanced Water Heating Specification Tier-4 minimum requirements" "AWHSTier4Generic50","Any 50-gal tank meeting Advanced Water Heating Specification Tier-4 minimum requirements" "AWHSTier4Generic65","Any 65-gal tank meeting Advanced Water Heating Specification Tier-4 minimum requirements" "AWHSTier4Generic80","Any 80-gal tank meeting Advanced Water Heating Specification Tier-4 minimum requirements" +"BradfordWhiteAeroThermRE2H50","Bradford White 50-gal AeroTherm2023" +"BradfordWhiteAeroThermRE2H65","Bradford White 65-gal AeroTherm2023" +"BradfordWhiteAeroThermRE2H80","Bradford White 80-gal AeroTherm2023" +"LG_APHWC50","LG 50-gal integrated HPWH" END %> diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index a4cee721f..47b269607 100644 --- a/src/CNDTYPES.DEF +++ b/src/CNDTYPES.DEF @@ -414,6 +414,7 @@ PIPESEGP -- "class PIPESEG*" AOSMITHHPTU80 "AOSmithHPTU80" // 80 gallon AOSmith HPTU AOSMITHHPTU80DR "AOSmithHPTU80DR" // 80 gallon AOSmith HPTU (demand reduction variant) AOSMITHCAHP120 "AOSmithCAHP120" // 120 gallon AOSmith + AOSMITHHPTS40 "AOSmithHPTS40" // 40 gallon AOSmith HPTS AOSMITHHPTS50 "AOSmithHPTS50" // 50 gallon AOSmith HPTS AOSMITHHPTS66 "AOSmithHPTS66" // 66 gallon AOSmith HPTS AOSMITHHPTS80 "AOSmithHPTS80" // 80 gallon AOSmith HPTS @@ -535,6 +536,8 @@ PIPESEGP -- "class PIPESEG*" BRADFORDWHITEAEROTHERMRE2H50 "BradfordWhiteAeroThermRE2H50" // 50-gal AeroTherm2023 BRADFORDWHITEAEROTHERMRE2H65 "BradfordWhiteAeroThermRE2H65" // 65-gal AeroTherm2023 BRADFORDWHITEAEROTHERMRE2H80 "BradfordWhiteAeroThermRE2H80" // 80-gal AeroTherm2023 + + LG_APHWC50 "LG_APHWC50" // 50-gal LG model (added 11-11-2024) } *choicb WHRESTYCH { // resistance heater types diff --git a/src/RCDEF/rcdef.cpp b/src/RCDEF/rcdef.cpp index 028cc4c86..b158858f2 100644 --- a/src/RCDEF/rcdef.cpp +++ b/src/RCDEF/rcdef.cpp @@ -212,7 +212,7 @@ const int MAXFDREC=600; // Max fields in a record. Separated from MAXFIELDS, 4- const int MAXDTH=600; // max+1 data type handle. 800-->200 1-92 ->400 3-92. ->432(0x1b0) 2-94. ->352 (0x160) 5-95. // 352->400, 1-16; 400->500, 4-16; 500->600, 9-20 -const int MAXDTC=108; // maximum number of choices for choice data type. +const int MAXDTC=110; // maximum number of choices for choice data type. //#define MAXARRAY 20 // largest number of record array structure members * NOT checked, but should be. const int MAXNAMEL = 40; // Max length of name, etc ("s" token) const int MAXQSTRL = 512; // Max length for quoted string ("q" token). assumed >= MAXNAMEL for array allocations. diff --git a/src/dhwcalc.cpp b/src/dhwcalc.cpp index a1e15cb3a..b912d809b 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -3004,7 +3004,7 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater { C_WHASHPTYCH_BASICINT, hwatSMALL | HPWH::MODELS_basicIntegrated }, { C_WHASHPTYCH_RESTANK, hwatSMALL | HPWH::MODELS_restankRealistic }, { C_WHASHPTYCH_RESTANKNOUA, hwatSMALL | HPWH::MODELS_restankNoUA }, - { C_WHASHPTYCH_AOSMITHSHPT50, hwatSMALL | HPWH::MODELS_GE2012 }, // AO Smith SHPT models: base on GE2012 + { C_WHASHPTYCH_AOSMITHSHPT50, hwatSMALL | HPWH::MODELS_GE2012 }, // AO Smith SHPT models: base on GE2012 { C_WHASHPTYCH_AOSMITHSHPT66, hwatSMALL | HPWH::MODELS_GE2012 }, // caller must modify UA and vol { C_WHASHPTYCH_AOSMITHSHPT80, hwatSMALL | HPWH::MODELS_GE2012 }, { C_WHASHPTYCH_AOSMITHPHPT60, hwatSMALL | HPWH::MODELS_AOSmithPHPT60 }, @@ -3014,6 +3014,7 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater { C_WHASHPTYCH_AOSMITHHPTU80, hwatSMALL | HPWH::MODELS_AOSmithHPTU80 }, { C_WHASHPTYCH_AOSMITHHPTU80DR, hwatSMALL | HPWH::MODELS_AOSmithHPTU80_DR }, { C_WHASHPTYCH_AOSMITHCAHP120, hwatSMALL | HPWH::MODELS_AOSmithCAHP120 }, + { C_WHASHPTYCH_AOSMITHHPTS40, hwatSMALL | HPWH::MODELS_AOSmithHPTS40}, { C_WHASHPTYCH_AOSMITHHPTS50, hwatSMALL | HPWH::MODELS_AOSmithHPTS50 }, { C_WHASHPTYCH_AOSMITHHPTS66, hwatSMALL | HPWH::MODELS_AOSmithHPTS66 }, { C_WHASHPTYCH_AOSMITHHPTS80, hwatSMALL | HPWH::MODELS_AOSmithHPTS80 }, @@ -3130,6 +3131,8 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater { C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H65,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H65}, { C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H80,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H80}, + { C_WHASHPTYCH_LG_APHWC50, hwatSMALL | HPWH::MODELS_LG_APHWC50}, + { 32767, HPWH::MODELS(-1) } }; SI tableVal = presetTbl->lookup(ashpTy); diff --git a/vendor/HPWHsim b/vendor/HPWHsim index b816b0c76..9b334f973 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit b816b0c768b7a8c30da2edd0737c015dd3380d37 +Subproject commit 9b334f973cb56a961ad3f024574925cdaa884ad6