From f0611bcc50c148d48707194e933d313521fda534 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 11 Nov 2024 10:35:37 -0700 Subject: [PATCH 01/10] Add models; update HPWHsim. --- src/CNDTYPES.DEF | 3 +++ src/RCDEF/rcdef.cpp | 2 +- src/dhwcalc.cpp | 3 +++ vendor/HPWHsim | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index a4cee721f..7946fcd09 100644 --- a/src/CNDTYPES.DEF +++ b/src/CNDTYPES.DEF @@ -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" @@ -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..350953dca 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -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 }, @@ -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 From 2db743a6d219dc5369b54dd8be75a0f2f917ea46 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 11 Nov 2024 14:29:37 -0700 Subject: [PATCH 02/10] Move definition. --- src/CNDTYPES.DEF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index 7946fcd09..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 @@ -458,7 +459,6 @@ 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" From 35421fe5edef1aee93c468f238d1fd0dadb7e4b2 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 12 Nov 2024 14:41:21 -0700 Subject: [PATCH 03/10] Fix model assignment. --- src/dhwcalc.cpp | 4 ++-- vendor/HPWHsim | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dhwcalc.cpp b/src/dhwcalc.cpp index 350953dca..b912d809b 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -3004,8 +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_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 }, @@ -3015,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 }, diff --git a/vendor/HPWHsim b/vendor/HPWHsim index 9b334f973..608ba633c 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit 9b334f973cb56a961ad3f024574925cdaa884ad6 +Subproject commit 608ba633c31b3cdda9aeef5ed4e5fd56f6aa52f7 From 92a4d0b937c61587292334089d7af03f792bcc5a Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 12 Nov 2024 14:48:58 -0700 Subject: [PATCH 04/10] Update doc and HPWHsim. --- doc/src/records/dhwheater-doc.md | 7 ++++++- vendor/HPWHsim | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/src/records/dhwheater-doc.md b/doc/src/records/dhwheater-doc.md index a495085c7..aa448cdb4 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,13 @@ 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" +"LG_APHWC50","LG 50-gal integrated HPWH" END %> diff --git a/vendor/HPWHsim b/vendor/HPWHsim index 608ba633c..9b334f973 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit 608ba633c31b3cdda9aeef5ed4e5fd56f6aa52f7 +Subproject commit 9b334f973cb56a961ad3f024574925cdaa884ad6 From 6238618134c20526bd30488fef3c562f0069a0a1 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 12 Nov 2024 14:54:44 -0700 Subject: [PATCH 05/10] Add BradfordWhite models. --- doc/src/records/dhwheater-doc.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/src/records/dhwheater-doc.md b/doc/src/records/dhwheater-doc.md index aa448cdb4..5b37a990e 100644 --- a/doc/src/records/dhwheater-doc.md +++ b/doc/src/records/dhwheater-doc.md @@ -361,6 +361,9 @@ Air source heat pump type, valid only if whHeatSrc=ASHPX. These choices are supp "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 %> From 597a564a4b134a2b878d7908fb8c29a8a830a89e Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 12 Nov 2024 15:33:45 -0700 Subject: [PATCH 06/10] Remove spaces. --- doc/src/records/dhwheater-doc.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/records/dhwheater-doc.md b/doc/src/records/dhwheater-doc.md index 5b37a990e..529a06d3a 100644 --- a/doc/src/records/dhwheater-doc.md +++ b/doc/src/records/dhwheater-doc.md @@ -361,9 +361,9 @@ Air source heat pump type, valid only if whHeatSrc=ASHPX. These choices are supp "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" +"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 %> From 16422d41726477d0712749f61810bbe9f493aef2 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 10 Dec 2024 11:09:37 -0700 Subject: [PATCH 07/10] Add LG 80-gal hpwh. --- vendor/HPWHsim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/HPWHsim b/vendor/HPWHsim index 9b334f973..2e69db755 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit 9b334f973cb56a961ad3f024574925cdaa884ad6 +Subproject commit 2e69db7556ae6d5b70933465a6dbd6f679a1c728 From bb4a12736bcd09ab4fadd16a448355fc6e78bf5b Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Tue, 10 Dec 2024 11:13:10 -0700 Subject: [PATCH 08/10] Add 80-gal LG. --- doc/src/records/dhwheater-doc.md | 1 + src/CNDTYPES.DEF | 1 + src/RCDEF/rcdef.cpp | 2 +- src/dhwcalc.cpp | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/src/records/dhwheater-doc.md b/doc/src/records/dhwheater-doc.md index 529a06d3a..168c2d5b9 100644 --- a/doc/src/records/dhwheater-doc.md +++ b/doc/src/records/dhwheater-doc.md @@ -365,6 +365,7 @@ Air source heat pump type, valid only if whHeatSrc=ASHPX. These choices are supp "BradfordWhiteAeroThermRE2H65","Bradford White 65-gal AeroTherm2023" "BradfordWhiteAeroThermRE2H80","Bradford White 80-gal AeroTherm2023" "LG_APHWC50","LG 50-gal integrated HPWH" +"LG_APHWC80","LG 580-gal integrated HPWH" END %> diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index 47b269607..d98bb7f0f 100644 --- a/src/CNDTYPES.DEF +++ b/src/CNDTYPES.DEF @@ -538,6 +538,7 @@ PIPESEGP -- "class PIPESEG*" BRADFORDWHITEAEROTHERMRE2H80 "BradfordWhiteAeroThermRE2H80" // 80-gal AeroTherm2023 LG_APHWC50 "LG_APHWC50" // 50-gal LG model (added 11-11-2024) + LG_APHWC80 "LG_APHWC80" // 80-gal LG model (added 12-10-2024) } *choicb WHRESTYCH { // resistance heater types diff --git a/src/RCDEF/rcdef.cpp b/src/RCDEF/rcdef.cpp index b158858f2..54b982de8 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=110; // maximum number of choices for choice data type. +const int MAXDTC=111; // 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 b912d809b..5a9bd7a14 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -3132,6 +3132,7 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater { C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H80,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H80}, { C_WHASHPTYCH_LG_APHWC50, hwatSMALL | HPWH::MODELS_LG_APHWC50}, + { C_WHASHPTYCH_LG_APHWC80, hwatSMALL | HPWH::MODELS_LG_APHWC80}, { 32767, HPWH::MODELS(-1) } }; From c3aa9f7e583cf820b28eb83d29555c9443d73d84 Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Wed, 11 Dec 2024 16:20:00 -0700 Subject: [PATCH 09/10] Update HPWHsim to v1.24.0. --- vendor/HPWHsim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/HPWHsim b/vendor/HPWHsim index 2e69db755..ca590853a 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit 2e69db7556ae6d5b70933465a6dbd6f679a1c728 +Subproject commit ca590853a923dd9764876c20a5ccb42932d9487d From e0b0c8c2c3e81d8a0776c70dba90c64d64340dae Mon Sep 17 00:00:00 2001 From: Neal Kruis Date: Wed, 11 Dec 2024 16:24:54 -0700 Subject: [PATCH 10/10] Update CI to MacOS 13. --- .github/workflows/build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index c4b51782f..93f9fb6b0 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -27,7 +27,7 @@ jobs: # compiler: clang # experimental: true - os: macos - os_ver: "12" + os_ver: "13" config: Release arch: "64" compiler: clang