Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Aerotherm models. #498

Merged
merged 9 commits into from
Nov 6, 2024
Merged

Add Aerotherm models. #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d0676e
Merge branch 'use-courier-hpwh' into develop-hpwh
Jun 12, 2024
15592cc
Add Aerotherm models.
Aug 19, 2024
d054b23
Update HPWHsim.
Aug 27, 2024
9fdd258
Update HPWHsim.
Sep 10, 2024
16c4bc9
Update HPWHsim.
spahrenk Oct 2, 2024
634db95
Merge main.
spahrenk Oct 2, 2024
c925c17
Change model names.
spahrenk Oct 23, 2024
6666235
Update HPWHsim.
spahrenk Nov 5, 2024
3060bdb
Merge branch 'develop-hpwh' into add-aerotherm-hpwh
spahrenk Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/CNDTYPES.DEF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,10 @@ PIPESEGP -- "class PIPESEG*"
AWHSTIER4GENERIC50 "AWHSTier4Generic50" // 50-gal tier-4 generic
AWHSTIER4GENERIC65 "AWHSTier4Generic65" // 65-gal tier-4 generic
AWHSTIER4GENERIC80 "AWHSTier4Generic80" // 80-gal tier-4 generic

BRADFORDWHITEAEROTHERMRE2H50 "BradfordWhiteAeroThermRE2H50" // 50-gal AeroTherm2023
BRADFORDWHITEAEROTHERMRE2H65 "BradfordWhiteAeroThermRE2H65" // 65-gal AeroTherm2023
BRADFORDWHITEAEROTHERMRE2H80 "BradfordWhiteAeroThermRE2H80" // 80-gal AeroTherm2023
}

*choicb WHRESTYCH { // resistance heater types
Expand Down
2 changes: 1 addition & 1 deletion src/RCDEF/rcdef.cpp
View file
Open in desktop
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=105; // maximum number of choices for choice data type.
const int MAXDTC=108; // 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
4 changes: 4 additions & 0 deletions src/dhwcalc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3126,6 +3126,10 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater
{ C_WHASHPTYCH_AWHSTIER4GENERIC65, hwatSMALL | HPWH::MODELS_AWHSTier4Generic65 },
{ C_WHASHPTYCH_AWHSTIER4GENERIC80, hwatSMALL | HPWH::MODELS_AWHSTier4Generic80 },

{ C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H50,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H50},
{ C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H65,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H65},
{ C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H80,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H80},

{ 32767, HPWH::MODELS(-1) } };

SI tableVal = presetTbl->lookup(ashpTy);
Expand Down
Loading