Skip to content

Add generic models hpwh #478

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

Merged
merged 6 commits into from
Apr 24, 2024
Merged

Add generic models hpwh #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a48c013
Update HPWHsim. Define tier4 models.
Apr 13, 2024
2630532
Enable Tier4 models.
Apr 13, 2024
bebd72c
Update HPWH.
Apr 13, 2024
bd25962
Replace refs.
Apr 15, 2024
cef929d
Add GenericUEF217 model.
Apr 18, 2024
f0445ca
Update HPHWsim.
Apr 22, 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
6 changes: 6 additions & 0 deletions src/CNDTYPES.DEF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,12 @@ PIPESEGP -- "class PIPESEG*"

AQUATHERMAIRE "AquaThermAire" // heat-exchange model

GENERICUEF217 "GenericUEF217"

AWHSTIER4GENERIC40 "AWHSTier4Generic40" // 40-gal tier-4 generic
AWHSTIER4GENERIC50 "AWHSTier4Generic50" // 50-gal tier-4 generic
AWHSTIER4GENERIC65 "AWHSTier4Generic65" // 65-gal tier-4 generic
AWHSTIER4GENERIC80 "AWHSTier4Generic80" // 80-gal tier-4 generic
}

*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=100; // maximum number of choices for choice data type.
const int MAXDTC=105; // 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
6 changes: 6 additions & 0 deletions src/dhwcalc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3113,6 +3113,12 @@ RC HPWHLINK::hw_InitResistance( // set up HPWH has EF-rated resistance heater
{ C_WHASHPTYCH_SCALABLE_SP, hwatLARGE | HPWH::MODELS_TamScalable_SP },
{ C_WHASHPTYCH_SCALABLE_MP, hwatLARGE | HPWH::MODELS_Scalable_MP },

{ C_WHASHPTYCH_GENERICUEF217, hwatSMALL | HPWH::MODELS_GenericUEF217 },
{ C_WHASHPTYCH_AWHSTIER4GENERIC40, hwatSMALL | HPWH::MODELS_AWHSTier4Generic40 },
{ C_WHASHPTYCH_AWHSTIER4GENERIC50, hwatSMALL | HPWH::MODELS_AWHSTier4Generic50 },
{ C_WHASHPTYCH_AWHSTIER4GENERIC65, hwatSMALL | HPWH::MODELS_AWHSTier4Generic65 },
{ C_WHASHPTYCH_AWHSTIER4GENERIC80, hwatSMALL | HPWH::MODELS_AWHSTier4Generic80 },

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

SI tableVal = presetTbl->lookup(ashpTy);
Expand Down
98 changes: 49 additions & 49 deletions test/ref-win32-msvc/DHW_BRWL.REP
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions test/ref-win32-msvc/DHW_ZONE.REP
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,7 @@ Daily User-defined Report, Jan
5 51.133 0 -39.08 0 0 0 0 58.640 -3.970 29.108 2.436 -0.0000 0 0 0 0 0 4.002 0 0.00166
6 51.209 0 -39.45 0 0 0 0 66.350 -3.543 19.506 0.0598 -0.0000 0 0 0 0 0 8.281 0 0.00256
7 51.389 0 -39.12 0 0 0 0 77.858 -3.251 7.165 -1.330 -0.0000 0 0 0 0 0 10.063 0 .000002
8 51.446 0 -38.45 0 0 0 0 79.481 -3.418 6.910 -0.707 -0.0000 0 0 0 0 0 7.628 0 .000630
8 51.446 0 -38.45 0 0 0 0 79.481 -3.418 6.910 -0.707 0.0000 0 0 0 0 0 7.628 0 .000630
9 51.518 0 -38.75 0 0 0 0 78.919 -3.441 6.398 0.450 0.0000 0 0 0 0 0 7.943 0 0.00161
10 51.619 0 -37.83 0 0 0 0 82.250 -3.432 4.606 -1.108 -0.0000 0 0 0 0 0 7.132 0 0.00157
11 51.672 0 -37.93 0 0 0 0 81.489 -3.500 4.606 0.0917 0.0000 0 0 0 0 0 6.907 0 0.00277
Expand Down Expand Up @@ -1310,7 +1310,7 @@ Daily User-defined Report, Jan
! Log for Run 001:

################
! CSE 0.921.0+wudays-check.d4ed889a.60.dirty for Win32 console Tue 27-Feb-24 2:21:02 pm
! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console Mon 15-Apr-24 12:06:59 pm


================
Expand Down Expand Up @@ -4183,7 +4183,7 @@ Garage W: mwIG=0.000 mwInf=0.000 mwAN=0.000 mwDuctLk=0.000 mwSys=0.000 mwS
Garage UZ: anMCp/T[ 0]=0.00/0.0 anMCp/T[ 1]=0.00/0.0 ventUt=0
Nair=12147.25 Dair=147.66 Nrad=108974.91 Drad=1360.41 CX=187.67 airX=0.000
ta=81.12 tr=80.23 qIzSh=0 fvent=0.000 pz0=0.0005 qsHvac=0
! CSE 0.921.0+wudays-check.d4ed889a.60.dirty for Win32 console
! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console



Expand Down Expand Up @@ -5527,18 +5527,18 @@ Input for Run 001:



! CSE 0.921.0+wudays-check.d4ed889a.60.dirty for Win32 console run(s) done: Tue 27-Feb-24 2:21:04 pm
! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console run(s) done: Mon 15-Apr-24 12:07:02 pm

! Executable: d:\cse\msvc\cse.exe
! 27-Feb-24 2:12 pm (VS 14.29 2873344 bytes) (HPWH 1.23.0+HEAD.4609465.28)
! Command line: -x! -t1 dhw_zone
! Input file: D:\cse\test\dhw_zone.cse
! Report file: D:\CSE\TEST\DHW_ZONE.REP
! Executable: c:\users\phil ahrenkiel\documents\github\cse\msvc\build\cse.exe
! 15-Apr-24 10:25 am (VS 14.29 2910720 bytes) (HPWH 1.23.0+add-generic-models.b9efd3b.126)
! Command line: -x! -b -t1 dhw_zone
! Input file: C:\Users\Phil Ahrenkiel\Documents\GitHub\cse\test\dhw_zone.cse
! Report file: C:\USERS\PHIL AHRENKIEL\DOCUMENTS\GITHUB\CSE\TEST\DHW_ZONE.REP

! Timing info --

! Input: Time = 0.05 Calls = 1 T/C = 0.0480
! Input: Time = 0.07 Calls = 1 T/C = 0.0670
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 1.82 Calls = 1 T/C = 1.8200
! Reports: Time = 0.00 Calls = 1 T/C = 0.0040
! Total: Time = 1.87 Calls = 1 T/C = 1.8740
! Simulation: Time = 2.85 Calls = 1 T/C = 2.8470
! Reports: Time = 0.01 Calls = 1 T/C = 0.0070
! Total: Time = 2.92 Calls = 1 T/C = 2.9220
28 changes: 14 additions & 14 deletions test/ref-win32-msvc/dhwloop32U.rep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ Hourly User-defined Report, Wed 04-Feb
10 95.868 0 -0.618 -5.267 0 0 0 83.685 -0.698 0 21.569 0.0000 0 -0.0207 0 -3.367 -0.0000 0 0 0.585
11 32.104 0 -0.544 -5.252 0 0 0 84.296 -0.827 0 -47.286 0.0000 0 -0.0206 0 1.722 -0.0000 0 0 0.0152
12 9.002 0 -0.513 -5.244 0 0 0 85.620 -1.087 0 -73.949 0.0000 0 -0.0203 0 4.192 0.0000 0 0 0.00188
13 6.966 0 -0.508 -5.243 0 0 0 85.189 -1.445 0 -75.407 -0.0000 0 -0.0199 0 4.398 -0.0000 0 0 0.00168
13 6.966 0 -0.508 -5.243 0 0 0 85.189 -1.445 0 -75.407 0.0000 0 -0.0199 0 4.398 -0.0000 0 0 0.00168
14 23.732 0 -0.520 -5.249 0 0 0 82.105 -1.747 0 -53.173 -0.0000 0 -0.0196 0 2.319 -0.0000 0 0 0.0158
15 24.838 0 -0.517 -5.249 0 0 0 55.856 -2.017 0 -24.865 0.0000 0 -0.0193 0 1.621 -0.0000 0 0 0.0302
16 50.100 0 -0.540 -5.257 0 0 0 0 -1.793 0 60.399 -0.0000 0 -0.0195 0 -2.718 -0.0000 0 0 0.0277
Expand All @@ -933,7 +933,7 @@ Hourly User-defined Report, Wed 04-Feb
20 18.427 0 -0.518 -5.247 0 0 0 0 -1.204 0 22.868 0.0000 0 -0.0189 0 2.537 -0.0000 0 0 0.00937
21 28.381 0 -0.533 -5.250 0 0 0 0 -1.125 0 34.024 0.0000 0 -0.0186 0 1.272 -0.0000 0 0 0.0115
22 20.857 0 -0.524 -5.248 0 0 0 11.446 -0.990 0 14.193 0.0000 0 -0.0185 0 2.006 -0.0000 0 0 -.00716
23 6.767 0 -0.511 -5.243 0 0 0 85.493 -1.127 0 -75.552 -0.0000 0 -0.0182 0 3.720 0.0000 0 0 0.00544
23 6.767 0 -0.511 -5.243 0 0 0 85.493 -1.127 0 -75.552 -0.0000 0 -0.0182 0 3.720 -0.0000 0 0 0.00544
24 8.171 0 -0.515 -5.243 0 0 0 84.312 -1.458 0 -72.244 -0.0000 0 -0.0179 0 3.330 -0.0000 0 0 0.00786

Day 633.331 0 -34.09 -126.0 0 0 0 717.967 -35.285 0 65.805 0.0000 36.434 -0.452 0 8.279 -0.0000 0.0194 0 0.618
Expand All @@ -955,7 +955,7 @@ Hourly User-defined Report, Fri 10-Jul
9 56.791 0 -0.472 -5.262 0 0 0 7.140 -0.390 0 57.984 -0.0000 0 -0.0200 0 -2.150 -0.0000 0 0 -0.0397
10 46.486 0 -0.446 -5.259 0 0 0 85.228 -0.342 0 -30.338 0.0000 0 -0.0203 0 -2.314 -0.0000 0 0 -0.0215
11 12.929 0 -0.390 -5.246 0 0 0 84.538 -0.574 0 -68.515 -0.0000 0 -0.0202 0 3.135 0.0000 0 0 -.00005
12 11.252 0 -0.377 -5.246 0 0 0 79.200 -0.877 0 -64.829 0.0000 0 -0.0199 0 3.400 -0.0000 0 0 0.00129
12 11.252 0 -0.377 -5.246 0 0 0 79.200 -0.877 0 -64.829 -0.0000 0 -0.0199 0 3.400 -0.0000 0 0 0.00129
13 8.088 0 -0.360 -5.244 0 0 0 36.023 -1.184 0 -25.001 0.0000 0 -0.0195 0 3.868 -0.0000 0 0 0.00505
14 10.410 0 -0.357 -5.245 0 0 0 0 -1.112 0 13.703 0.0000 0 -0.0192 0 3.428 -0.0000 0 0 0.0110
15 37.428 0 -0.386 -5.256 0 0 0 0 -0.983 0 46.222 0.0000 0 -0.0190 0 -2.205 -0.0000 0 0 0.0540
Expand All @@ -975,7 +975,7 @@ Hourly User-defined Report, Fri 10-Jul

! Log for Run 001:

! CSE 0.921.0+wudays-check.d4ed889a.60.dirty for Win32 console
! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console



Expand Down Expand Up @@ -6137,18 +6137,18 @@ Input for Run 001:



! CSE 0.921.0+wudays-check.d4ed889a.60.dirty for Win32 console run(s) done: Tue 27-Feb-24 3:13:10 pm
! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console run(s) done: Mon 15-Apr-24 12:07:34 pm

! Executable: d:\cse\msvc\cse.exe
! 27-Feb-24 2:12 pm (VS 14.29 2873344 bytes) (HPWH 1.23.0+HEAD.4609465.28)
! Command line: -x! -t1 dhwloop32U
! Input file: D:\cse\test\dhwloop32U.cse
! Report file: D:\CSE\TEST\DHWLOOP32U.REP
! Executable: c:\users\phil ahrenkiel\documents\github\cse\msvc\build\cse.exe
! 15-Apr-24 10:25 am (VS 14.29 2910720 bytes) (HPWH 1.23.0+add-generic-models.b9efd3b.126)
! Command line: -x! -b -t1 dhwloop32U
! Input file: C:\Users\Phil Ahrenkiel\Documents\GitHub\cse\test\dhwloop32U.cse
! Report file: C:\USERS\PHIL AHRENKIEL\DOCUMENTS\GITHUB\CSE\TEST\DHWLOOP32U.REP

! Timing info --

! Input: Time = 0.40 Calls = 1 T/C = 0.4010
! Input: Time = 0.80 Calls = 1 T/C = 0.8010
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 4.95 Calls = 1 T/C = 4.9530
! Reports: Time = 0.01 Calls = 1 T/C = 0.0050
! Total: Time = 5.36 Calls = 1 T/C = 5.3630
! Simulation: Time = 8.17 Calls = 1 T/C = 8.1690
! Reports: Time = 0.01 Calls = 1 T/C = 0.0080
! Total: Time = 8.98 Calls = 1 T/C = 8.9790
2 changes: 1 addition & 1 deletion vendor/HPWHsim
Open in desktop
Submodule HPWHsim updated 15 files
+2 −1 CMakeLists.txt
+1,693 −238 src/HPWH.cc
+208 −35 src/HPWH.hh
+3 −18 src/HPWHHeatSources.cc
+4 −1 src/HPWHHeatingLogics.cc
+166 −0 src/HPWHpresets.cc
+92 −0 test/AWHSTier4Generic40.txt
+92 −0 test/AWHSTier4Generic50.txt
+92 −0 test/AWHSTier4Generic65.txt
+92 −0 test/AWHSTier4Generic80.txt
+13 −3 test/CMakeLists.txt
+93 −0 test/makeGeneric.cc
+136 −0 test/measureMetrics.cc
+1 −0 test/unit_tests/CMakeLists.txt
+87 −0 test/unit_tests/measureMetricsTest.cpp