Skip to content

Support AquaThermAire DHW heater #445

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

Closed
wants to merge 5 commits into from
Closed

Support AquaThermAire DHW heater #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca5894c
A few initial ideas
chipbarnaby Oct 19, 2023
8808977
Merge branch 'main' into aquatherm
chipbarnaby Nov 8, 2023
71a8662
HPWHsim branch heat-exchange-models
chipbarnaby Nov 13, 2023
76f76a1
Initial AquaThermAire integration
chipbarnaby Nov 17, 2023
8f19313
Update HPWHsim
chipbarnaby Nov 27, 2023
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
2 changes: 2 additions & 0 deletions src/CNDTYPES.DEF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ PIPESEGP -- "class PIPESEG*"
AOSMITHSHPT66 "AOSmithSHPT66"
AOSMITHSHPT80 "AOSmithSHPT80"

AQUATHERMAIRE "AquaThermAire" // Villara AquaThermAire system

GENERIC1 "GenericTier1" // Generic Tier 1
GENERIC2 "GenericTier2" // Generic Tier 2
GENERIC3 "GenericTier3" // Generic Tier 3
Expand Down
13 changes: 9 additions & 4 deletions src/dhwcalc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3069,6 +3069,8 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater
{ C_WHASHPTYCH_AWHSTIER3GENERIC65, hwatSMALL | HPWH::MODELS_AWHSTier3Generic65 },
{ C_WHASHPTYCH_AWHSTIER3GENERIC80, hwatSMALL | HPWH::MODELS_AWHSTier3Generic80 },

{ C_WHASHPTYCH_AQUATHERMAIRE, hwatSMALL | HPWH::MODELS_AQUATHERMAIRE },

// large
{ C_WHASHPTYCH_SANCO2_GS3, hwatLARGE | HPWH::MODELS_SANCO2_GS3_45HPA_US_SP },
{ C_WHASHPTYCH_COLMACCXV5_SP, hwatLARGE | HPWH::MODELS_ColmacCxV_5_SP },
Expand Down Expand Up @@ -4366,8 +4368,13 @@ RC DHWHEATER::wh_Init() // init for run
if (wh_IsHPWHModel())
rc |= wh_HPWHInit(); // set up from DHWHEATER inputs

else if (wh_type == C_WHTYPECH_INSTUEF)
rc |= wh_InstUEFInit(); // UEF-based instantaneous water heater model 5-2017
else if (wh_IsInstUEFModel())
rc |= wh_InstUEFInit(); // UEF-based instantaneous water heater model

#if defined( _DEBUG)
else
ASSERT( 1); // missing case
#endif

return rc;
} // DHWHEATER::wh_Init
Expand Down Expand Up @@ -4892,7 +4899,6 @@ RC DHWHEATER::wh_DoSubhrTick( // DHWHEATER energy use for 1 tick

if (wh_IsInstUEFModel())
rc |= wh_InstUEFDoSubhrTick(drawForTick, tInletMix, scaleWH, pWS->ws_tUse);

else
{ float deltaT = max(1.f, pWS->ws_tUse - tInletMix);

Expand Down Expand Up @@ -5222,7 +5228,6 @@ RC DHWHEATER::wh_InstUEFDoSubhrTick(
}
return rc;
} // DHWHEATER::wh_InstUEFDoSubhrTick

//=============================================================================

///////////////////////////////////////////////////////////////////////////////
Expand Down
2 changes: 1 addition & 1 deletion vendor/HPWHsim
Open in desktop
Submodule HPWHsim updated 25 files
+1 −0 src/CMakeLists.txt
+1,589 −2,931 src/HPWH.cc
+839 −810 src/HPWH.in.hh
+1,048 −0 src/HPWHHeatSources.cc
+67 −75 src/HPWHHeatingLogics.cc
+610 −723 src/HPWHpresets.cc
+1 −1 test/AOSmithHPTS50.txt
+1 −1 test/AOSmithHPTU80.txt
+71 −0 test/AquaThermAire.txt
+29 −2 test/CMakeLists.txt
+1 −1 test/GE502014.txt
+1 −1 test/Rheem2020Build50.txt
+1 −1 test/Rheem2020Prem40.txt
+1 −1 test/Rheem2020Prem50.txt
+1 −1 test/RheemHB50.txt
+1 −1 test/Stiebel220e.txt
+30 −0 test/testHeatingLogics.cc
+88 −1 test/testMaxSetpoint.cc
+3 −0 test/testUtilityFcts.cc
+2 −0 test/villara_24hr67/DRschedule.csv
+1,442 −0 test/villara_24hr67/ambientTschedule.csv
+55 −0 test/villara_24hr67/drawschedule.csv
+1,442 −0 test/villara_24hr67/evaporatorTschedule.csv
+1,442 −0 test/villara_24hr67/inletTschedule.csv
+2 −0 test/villara_24hr67/testInfo.txt