Skip to content

Commit

Permalink
Add models; update HPWHsim.
Browse files Browse the repository at this point in the history
  • Loading branch information
spahrenk committed Nov 11, 2024
1 parent dbed601 commit f0611bc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/CNDTYPES.DEF
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ PIPESEGP -- "class PIPESEG*"

STIEBEL220E "Stiebel220E" // Stiebel Eltron (2014 model?)

AOSMITHHPTS40 "AOSmithHPTS40" // AOSmith add'l model (added 11-11-2024)
AOSMITHSHPT50 "AOSmithSHPT50" // AOSmith add'l models (added 3-24-2017)
AOSMITHSHPT66 "AOSmithSHPT66"
AOSMITHSHPT80 "AOSmithSHPT80"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/RCDEF/rcdef.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions src/dhwcalc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3004,6 +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_AOSMITHHPTS40, hwatSMALL | HPWH::MODELS_GE2012 }, // AO Smith HPTS model: 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 },
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion vendor/HPWHsim
Submodule HPWHsim updated 100 files

0 comments on commit f0611bc

Please sign in to comment.