From a48c0136650c633290a7ef7c464af5d7bc8877e4 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Sat, 13 Apr 2024 10:14:13 -0600 Subject: [PATCH 1/6] Update HPWHsim. Define tier4 models. --- src/dhwcalc.cpp | 5 +++++ vendor/HPWHsim | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dhwcalc.cpp b/src/dhwcalc.cpp index 601e9911a..bd74535bb 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -3059,6 +3059,11 @@ 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_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 }, + { C_WHASHPTYCH_AQUATHERMAIRE, hwatSMALL | HPWH::MODELS_AquaThermAire }, // large diff --git a/vendor/HPWHsim b/vendor/HPWHsim index f90302f0b..b9111705b 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit f90302f0b65c6bd7482bf07d8a58fa9d3178e1e6 +Subproject commit b9111705bdc1026e287f625217d12c8e42090ce4 From 26305323690337d47951e107e1b8fdf1e80285e7 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Sat, 13 Apr 2024 17:13:20 -0600 Subject: [PATCH 2/6] Enable Tier4 models. --- src/CNDTYPES.DEF | 4 ++++ src/RCDEF/rcdef.cpp | 2 +- src/dhwcalc.cpp | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index 3ec8f10ec..454a21752 100644 --- a/src/CNDTYPES.DEF +++ b/src/CNDTYPES.DEF @@ -524,6 +524,10 @@ PIPESEGP -- "class PIPESEG*" AQUATHERMAIRE "AquaThermAire" // heat-exchange model + 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 diff --git a/src/RCDEF/rcdef.cpp b/src/RCDEF/rcdef.cpp index 899c9fa6e..f8bab93d5 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=100; // maximum number of choices for choice data type. +const int MAXDTC=104; // 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 bd74535bb..fc09dc770 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -3059,11 +3059,6 @@ 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_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 }, - { C_WHASHPTYCH_AQUATHERMAIRE, hwatSMALL | HPWH::MODELS_AquaThermAire }, // large @@ -3118,6 +3113,11 @@ 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_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); From bebd72cdee49d2d959bd136a96e4d12c7a309b41 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Sat, 13 Apr 2024 17:33:43 -0600 Subject: [PATCH 3/6] Update HPWH. --- vendor/HPWHsim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/HPWHsim b/vendor/HPWHsim index b9111705b..b9efd3b13 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit b9111705bdc1026e287f625217d12c8e42090ce4 +Subproject commit b9efd3b136c038dfb6d4bfb5b2c836ed79f5d9e9 From bd259629196f9ec2965ca3a433776fc623ab0309 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 15 Apr 2024 12:46:10 -0600 Subject: [PATCH 4/6] Replace refs. --- test/ref-win32-msvc/DHW_BRWL.REP | 98 +++++++++++++++--------------- test/ref-win32-msvc/DHW_ZONE.REP | 26 ++++---- test/ref-win32-msvc/dhwloop32U.rep | 28 ++++----- 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/test/ref-win32-msvc/DHW_BRWL.REP b/test/ref-win32-msvc/DHW_BRWL.REP index c00cd6513..ced3d12ef 100644 --- a/test/ref-win32-msvc/DHW_BRWL.REP +++ b/test/ref-win32-msvc/DHW_BRWL.REP @@ -2,7 +2,7 @@ ! Log for Run 001: -! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.bf0cee46.45 for Win32 console +! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console @@ -1995,7 +1995,7 @@ Subhourly User-defined Report, Thu 01-Jan 5 0 0 0 -0.206 0 0 0 0 -.00289 0 0.209 0.0000 0 0 0 0 0 0 0 .000006 6 0 0 0 -0.206 0 0 0 0 -.00288 0 0.209 0.0000 0 0 0 0 0 0 0 .000006 1 0 0 0 -0.206 0 0 0 0 -.00286 0 0.209 -0.0000 0 0 0 0 0 0 0 .000007 - 2 0 0 0 -0.206 0 0 0 0 -.00285 0 0.209 0.0000 0 0 0 0 0 0 0 .000007 + 2 0 0 0 -0.206 0 0 0 0 -.00285 0 0.209 -0.0000 0 0 0 0 0 0 0 .000007 3 0 0 0 -0.206 0 0 0 0 -.00284 0 0.209 -0.0000 0 0 0 0 0 0 0 .000008 4 0 0 0 -0.206 0 0 0 0 -.00283 0 0.209 0.0000 0 0 0 0 0 0 0 .000009 5 0 0 0 -0.206 0 0 0 0 -.00282 0 0.209 -0.0000 0 0 0 0 0 0 0 .000010 @@ -2015,16 +2015,16 @@ Subhourly User-defined Report, Thu 01-Jan 1 0 0 0 -0.206 0 0 0 0 -.00261 0 0.209 0.0000 0 0 0 0 0 0 0 .000159 2 0 0 0 -0.206 0 0 0 0 -.00260 0 0.209 -0.0000 0 0 0 0 0 0 0 .000181 3 0.150 0 0 -0.206 0 0 0 0 -.00259 0 0.358 0.0000 0 0 0 0 0 0 0 .000243 - 4 0 0 0 -0.206 0 0 0 0 -.00257 0 0.208 -0.0000 0 0 0 0 0 0 0 .000251 + 4 0 0 0 -0.206 0 0 0 0 -.00257 0 0.208 0.0000 0 0 0 0 0 0 0 .000251 5 0 0 0 -0.206 0 0 0 0 -.00256 0 0.208 -0.0000 0 0 0 0 0 0 0 .000260 6 0.304 0 0 -0.206 0 0 0 0 -.00254 0 0.512 0.0000 0 0 0 0 0 0 0 .000456 1 0.756 0 0 -0.206 0 0 0 0 -.00250 0 0.964 -0.0000 0 0 0 0 0 0 0 0.00100 2 2.033 0 0 -0.206 0 0 0 0 -.00241 0 2.239 0.0000 0 0 0 0 0 0 0 0.00294 - 3 2.320 0 0 -0.206 0 0 0 0 -.00227 0 2.524 -0.0000 0 0 0 0 0 0 0 0.00414 + 3 2.320 0 0 -0.206 0 0 0 0 -.00227 0 2.524 0.0000 0 0 0 0 0 0 0 0.00414 4 0 0 0 -0.206 0 0 0 0 -.00220 0 0.208 0.0000 0 0 0 0 0 0 0 .000653 - 5 0.763 0 0 -0.206 0 0 0 0 -.00215 0 0.970 -0.0000 0 0 0 0 0 0 0 0.00172 - 6 5.090 0 0 -0.206 0 0 0 1.137 -.00203 0 4.138 0.0000 0 0 0 0 0 0 0 0.0220 - 1 2.475 0 0 -0.206 0 0 0 11.374 -.00211 0 -8.700 -0.0000 0 0 0 0 0 0 0 0.0103 + 5 0.763 0 0 -0.206 0 0 0 0 -.00215 0 0.970 0.0000 0 0 0 0 0 0 0 0.00172 + 6 5.090 0 0 -0.206 0 0 0 1.137 -.00203 0 4.138 -0.0000 0 0 0 0 0 0 0 0.0220 + 1 2.475 0 0 -0.206 0 0 0 11.374 -.00211 0 -8.700 0.0000 0 0 0 0 0 0 0 0.0103 2 2.004 0 0 -0.206 0 0 0 11.374 -.00260 0 -9.134 -0.0000 0 0 0 0 0 0 0 -0.0270 3 0.355 0 0 -0.206 0 0 0 1.472 -.00294 0 -0.902 -0.0000 0 0 0 0 0 0 0 -.00635 4 1.852 0 0 -0.206 0 0 0 0 -.00286 0 2.061 -0.0000 0 0 0 0 0 0 0 .000014 @@ -2041,15 +2041,15 @@ Subhourly User-defined Report, Thu 01-Jan 3 0.924 0 0 -0.206 0 0 0 1.088 -.00292 0 0.0545 -0.0000 0 0 0 0 0 0 0 -.00990 4 3.330 0 0 -0.206 0 0 0 0 -.00276 0 3.539 0.0000 0 0 0 0 0 0 0 .000021 5 0.597 0 0 -0.206 0 0 0 0 -.00268 0 0.806 0.0000 0 0 0 0 0 0 0 .000009 - 6 1.912 0 0 -0.206 0 0 0 0 -.00259 0 2.121 -0.0000 0 0 0 0 0 0 0 .000021 + 6 1.912 0 0 -0.206 0 0 0 0 -.00259 0 2.121 0.0000 0 0 0 0 0 0 0 .000021 1 4.509 0 0 -0.206 0 0 0 0 -.00239 0 4.717 -0.0000 0 0 0 0 0 0 0 .000108 2 0.631 0 0 -0.206 0 0 0 0 -.00226 0 0.839 0.0000 0 0 0 0 0 0 0 .000061 3 0 0 0 -0.206 0 0 0 0 -.00225 0 0.208 -0.0000 0 0 0 0 0 0 0 .000044 4 0 0 0 -0.206 0 0 0 0 -.00224 0 0.208 0.0000 0 0 0 0 0 0 0 .000061 - 5 1.059 0 0 -0.206 0 0 0 0 -.00219 0 1.267 -0.0000 0 0 0 0 0 0 0 .000385 - 6 6.748 0 0 -0.206 0 0 0 4.550 -.00205 0 2.395 0.0000 0 0 0 0 0 0 0 0.0119 + 5 1.059 0 0 -0.206 0 0 0 0 -.00219 0 1.267 0.0000 0 0 0 0 0 0 0 .000385 + 6 6.748 0 0 -0.206 0 0 0 4.550 -.00205 0 2.395 -0.0000 0 0 0 0 0 0 0 0.0119 1 6.594 0 0 -0.206 0 0 0 11.374 -.00209 0 -4.607 -0.0000 0 0 0 0 0 0 0 0.0351 - 2 0.887 0 0 -0.206 0 0 0 11.374 -.00254 0 -10.276 0 0 0 0 0 0 0 0 -.00140 + 2 0.887 0 0 -0.206 0 0 0 11.374 -.00254 0 -10.276 -0.0000 0 0 0 0 0 0 0 -.00140 3 1.586 0 0 -0.206 0 0 0 2.728 -.00291 0 -0.919 -0.0000 0 0 0 0 0 0 0 -0.0143 4 3.562 0 0 -0.206 0 0 0 0 -.00273 0 3.771 0.0000 0 0 0 0 0 0 0 .000022 5 0.234 0 0 -0.206 0 0 0 0 -.00266 0 0.443 0.0000 0 0 0 0 0 0 0 .000007 @@ -2059,23 +2059,23 @@ Subhourly User-defined Report, Thu 01-Jan 3 0.487 0 0 -0.206 0 0 0 0 -.00255 0 0.696 0.0000 0 0 0 0 0 0 0 .000018 4 0.601 0 0 -0.206 0 0 0 0 -.00251 0 0.810 -0.0000 0 0 0 0 0 0 0 .000029 5 0.181 0 0 -0.206 0 0 0 0 -.00248 0 0.390 0.0000 0 0 0 0 0 0 0 .000038 - 6 0.112 0 0 -0.206 0 0 0 0 -.00246 0 0.321 0.0000 0 0 0 0 0 0 0 .000046 + 6 0.112 0 0 -0.206 0 0 0 0 -.00246 0 0.321 -0.0000 0 0 0 0 0 0 0 .000046 1 2.576 0 0 -0.206 0 0 0 0 -.00237 0 2.783 0.0000 0 0 0 0 0 0 0 .000904 2 0.905 0 0 -0.206 0 0 0 0 -.00228 0 1.113 -0.0000 0 0 0 0 0 0 0 .000520 3 2.307 0 0 -0.206 0 0 0 0 -.00216 0 2.513 -0.0000 0 0 0 0 0 0 0 0.00197 4 0 0 0 -0.206 0 0 0 0 -.00211 0 0.208 0.0000 0 0 0 0 0 0 0 .000356 5 0.0787 0 0 -0.206 0 0 0 0 -.00210 0 0.287 -0.0000 0 0 0 0 0 0 0 .000469 - 6 0.831 0 0 -0.206 0 0 0 0 -.00206 0 1.038 -0.0000 0 0 0 0 0 0 0 0.00146 - 1 2.897 0 0 -0.206 0 0 0 0 -.00193 0 3.096 0.0000 0 0 0 0 0 0 0 0.00933 + 6 0.831 0 0 -0.206 0 0 0 0 -.00206 0 1.038 0.0000 0 0 0 0 0 0 0 0.00146 + 1 2.897 0 0 -0.206 0 0 0 0 -.00193 0 3.096 -0.0000 0 0 0 0 0 0 0 0.00933 2 2.259 0 0 -0.206 0 0 0 3.412 -.00184 0 -0.955 0.0000 0 0 0 0 0 0 0 0.0105 3 1.064 0 0 -0.206 0 0 0 11.374 -.00215 0 -10.110 -0.0000 0 0 0 0 0 0 0 0.00811 4 1.124 0 0 -0.206 0 0 0 10.604 -.00271 0 -9.244 -0.0000 0 0 0 0 0 0 0 -0.0282 - 5 0.267 0 0 -0.206 0 0 0 0 -.00296 0 0.476 0.0000 0 0 0 0 0 0 0 -.00030 + 5 0.267 0 0 -0.206 0 0 0 0 -.00296 0 0.476 -0.0000 0 0 0 0 0 0 0 -.00030 6 0.0581 0 0 -0.206 0 0 0 0 -.00293 0 0.267 -0.0000 0 0 0 0 0 0 0 .000005 1 1.689 0 0 -0.206 0 0 0 0 -.00285 0 1.898 0.0000 0 0 0 0 0 0 0 .000013 2 2.290 0 0 -0.206 0 0 0 0 -.00271 0 2.499 -0.0000 0 0 0 0 0 0 0 .000019 3 0 0 0 -0.206 0 0 0 0 -.00266 0 0.209 -0.0000 0 0 0 0 0 0 0 .000007 - 4 0.582 0 0 -0.206 0 0 0 0 -.00263 0 0.791 -0.0000 0 0 0 0 0 0 0 .000013 + 4 0.582 0 0 -0.206 0 0 0 0 -.00263 0 0.791 0.0000 0 0 0 0 0 0 0 .000013 5 0.357 0 0 -0.206 0 0 0 0 -.00259 0 0.566 -0.0000 0 0 0 0 0 0 0 .000013 6 0.0313 0 0 -0.206 0 0 0 0 -.00258 0 0.240 0.0000 0 0 0 0 0 0 0 .000011 1 1.083 0 0 -0.206 0 0 0 0 -.00256 0 1.291 0.0000 0 0 0 0 0 0 0 .000045 @@ -2086,7 +2086,7 @@ Subhourly User-defined Report, Thu 01-Jan 6 0 0 0 -0.206 0 0 0 0 -.00232 0 0.208 0.0000 0 0 0 0 0 0 0 .000150 1 0 0 0 -0.206 0 0 0 0 -.00231 0 0.208 -0.0000 0 0 0 0 0 0 0 .000187 2 0.212 0 0 -0.206 0 0 0 0 -.00229 0 0.420 0.0000 0 0 0 0 0 0 0 .000314 - 3 0 0 0 -0.206 0 0 0 0 -.00228 0 0.208 0.0000 0 0 0 0 0 0 0 .000294 + 3 0 0 0 -0.206 0 0 0 0 -.00228 0 0.208 -0.0000 0 0 0 0 0 0 0 .000294 4 0 0 0 -0.206 0 0 0 0 -.00227 0 0.208 0.0000 0 0 0 0 0 0 0 .000355 5 0 0 0 -0.206 0 0 0 0 -.00226 0 0.208 0.0000 0 0 0 0 0 0 0 .000426 6 0 0 0 -0.206 0 0 0 0 -.00226 0 0.208 0.0000 0 0 0 0 0 0 0 .000509 @@ -2094,7 +2094,7 @@ Subhourly User-defined Report, Thu 01-Jan 2 0.184 0 0 -0.206 0 0 0 0 -.00223 0 0.391 0.0000 0 0 0 0 0 0 0 .000939 3 0.148 0 0 -0.206 0 0 0 0 -.00221 0 0.355 0.0000 0 0 0 0 0 0 0 0.00112 4 0.233 0 0 -0.206 0 0 0 0 -.00219 0 0.440 0.0000 0 0 0 0 0 0 0 0.00143 - 5 0.168 0 0 -0.206 0 0 0 0 -.00216 0 0.374 0.0000 0 0 0 0 0 0 0 0.00178 + 5 0.168 0 0 -0.206 0 0 0 0 -.00216 0 0.374 -0.0000 0 0 0 0 0 0 0 0.00178 6 0.603 0 0 -0.206 0 0 0 0 -.00213 0 0.808 -0.0000 0 0 0 0 0 0 0 0.00334 1 1.076 0 0 -0.206 0 0 0 0 -.00206 0 1.277 0.0000 0 0 0 0 0 0 0 0.00684 2 0 0 0 -0.206 0 0 0 0 -.00204 0 0.204 0.0000 0 0 0 0 0 0 0 0.00421 @@ -2114,10 +2114,10 @@ Subhourly User-defined Report, Thu 01-Jan 4 0 0 0 -0.206 0 0 0 0 -.00238 0 0.208 0.0000 0 0 0 0 0 0 0 .000063 5 0.166 0 0 -0.206 0 0 0 0 -.00237 0 0.374 0.0000 0 0 0 0 0 0 0 .000109 6 0 0 0 -0.206 0 0 0 0 -.00235 0 0.208 0.0000 0 0 0 0 0 0 0 .000112 - 1 0 0 0 -0.206 0 0 0 0 -.00235 0 0.208 0.0000 0 0 0 0 0 0 0 .000142 - 2 0 0 0 -0.206 0 0 0 0 -.00234 0 0.208 -0.0000 0 0 0 0 0 0 0 .000180 - 3 0 0 0 -0.206 0 0 0 0 -.00233 0 0.208 0.0000 0 0 0 0 0 0 0 .000224 - 4 0 0 0 -0.206 0 0 0 0 -.00232 0 0.208 -0.0000 0 0 0 0 0 0 0 .000277 + 1 0 0 0 -0.206 0 0 0 0 -.00235 0 0.208 -0.0000 0 0 0 0 0 0 0 .000142 + 2 0 0 0 -0.206 0 0 0 0 -.00234 0 0.208 0.0000 0 0 0 0 0 0 0 .000180 + 3 0 0 0 -0.206 0 0 0 0 -.00233 0 0.208 -0.0000 0 0 0 0 0 0 0 .000224 + 4 0 0 0 -0.206 0 0 0 0 -.00232 0 0.208 0.0000 0 0 0 0 0 0 0 .000277 5 0 0 0 -0.206 0 0 0 0 -.00231 0 0.208 -0.0000 0 0 0 0 0 0 0 .000338 6 0 0 0 -0.206 0 0 0 0 -.00230 0 0.208 -0.0000 0 0 0 0 0 0 0 .000410 @@ -2130,7 +2130,7 @@ Subhourly User-defined Report, Fri 02-Jan Sh qOutDHW qOutHtg qLMisc qLLoop qDWHR qSSF qSolar qPrimWH qLossWH qAuxWH qStorWH qErrWH qPrimLH qLossLH qAuxLH qStorLH qErrLH qXBUDHW qXBUHtg qBal --- ------- ------- ------ ------ ------ ------ ------ ------- ------- ------ ------- ------- ------- ------- ------ ------- ------- ------- ------- ------- 1 0 0 0 -0.206 0 0 0 0 -.00229 0 0.208 0.0000 0 0 0 0 0 0 0 .000495 - 2 0 0 0 -0.206 0 0 0 0 -.00228 0 0.208 -0.0000 0 0 0 0 0 0 0 .000595 + 2 0 0 0 -0.206 0 0 0 0 -.00228 0 0.208 0.0000 0 0 0 0 0 0 0 .000595 3 0 0 0 -0.206 0 0 0 0 -.00227 0 0.208 0.0000 0 0 0 0 0 0 0 .000715 4 0 0 0 -0.206 0 0 0 0 -.00226 0 0.208 0.0000 0 0 0 0 0 0 0 .000860 5 0 0 0 -0.206 0 0 0 0 -.00225 0 0.207 -0.0000 0 0 0 0 0 0 0 0.00104 @@ -2149,20 +2149,20 @@ Subhourly User-defined Report, Fri 02-Jan 6 0 0 0 -0.206 0 0 0 0 -.00278 0 0.209 -0.0000 0 0 0 0 0 0 0 .000007 1 0 0 0 -0.206 0 0 0 0 -.00277 0 0.209 0.0000 0 0 0 0 0 0 0 .000006 2 0 0 0 -0.206 0 0 0 0 -.00276 0 0.209 0.0000 0 0 0 0 0 0 0 .000008 - 3 0 0 0 -0.206 0 0 0 0 -.00275 0 0.209 0.0000 0 0 0 0 0 0 0 .000009 + 3 0 0 0 -0.206 0 0 0 0 -.00275 0 0.209 -0.0000 0 0 0 0 0 0 0 .000009 4 0 0 0 -0.206 0 0 0 0 -.00274 0 0.209 -0.0000 0 0 0 0 0 0 0 .000010 5 0 0 0 -0.206 0 0 0 0 -.00273 0 0.209 0.0000 0 0 0 0 0 0 0 .000013 6 0 0 0 -0.206 0 0 0 0 -.00272 0 0.209 -0.0000 0 0 0 0 0 0 0 .000016 - 1 0 0 0 -0.206 0 0 0 0 -.00271 0 0.209 -0.0000 0 0 0 0 0 0 0 .000022 - 2 0 0 0 -0.206 0 0 0 0 -.00270 0 0.209 0.0000 0 0 0 0 0 0 0 .000029 + 1 0 0 0 -0.206 0 0 0 0 -.00271 0 0.209 0.0000 0 0 0 0 0 0 0 .000022 + 2 0 0 0 -0.206 0 0 0 0 -.00270 0 0.209 -0.0000 0 0 0 0 0 0 0 .000029 3 0 0 0 -0.206 0 0 0 0 -.00269 0 0.209 -0.0000 0 0 0 0 0 0 0 .000039 4 0 0 0 -0.206 0 0 0 0 -.00267 0 0.209 0.0000 0 0 0 0 0 0 0 .000051 5 0 0 0 -0.206 0 0 0 0 -.00266 0 0.209 0.0000 0 0 0 0 0 0 0 .000065 6 0 0 0 -0.206 0 0 0 0 -.00265 0 0.209 -0.0000 0 0 0 0 0 0 0 .000082 - 1 0 0 0 -0.206 0 0 0 0 -.00264 0 0.209 0.0000 0 0 0 0 0 0 0 .000102 + 1 0 0 0 -0.206 0 0 0 0 -.00264 0 0.209 -0.0000 0 0 0 0 0 0 0 .000102 2 0 0 0 -0.206 0 0 0 0 -.00263 0 0.209 -0.0000 0 0 0 0 0 0 0 .000125 3 0 0 0 -0.206 0 0 0 0 -.00262 0 0.209 0.0000 0 0 0 0 0 0 0 .000150 - 4 0 0 0 -0.206 0 0 0 0 -.00261 0 0.209 -0.0000 0 0 0 0 0 0 0 .000178 + 4 0 0 0 -0.206 0 0 0 0 -.00261 0 0.209 0.0000 0 0 0 0 0 0 0 .000178 5 0 0 0 -0.206 0 0 0 0 -.00260 0 0.209 0.0000 0 0 0 0 0 0 0 .000209 6 0 0 0 -0.206 0 0 0 0 -.00259 0 0.208 -0.0000 0 0 0 0 0 0 0 .000242 1 0 0 0 -0.206 0 0 0 0 -.00258 0 0.208 0.0000 0 0 0 0 0 0 0 .000279 @@ -2171,25 +2171,25 @@ Subhourly User-defined Report, Fri 02-Jan 4 0 0 0 -0.206 0 0 0 0 -.00255 0 0.208 -0.0000 0 0 0 0 0 0 0 .000405 5 1.042 0 0 -0.206 0 0 0 0 -.00250 0 1.249 -0.0000 0 0 0 0 0 0 0 0.00190 6 0.936 0 0 -0.206 0 0 0 0 -.00243 0 1.143 0.0000 0 0 0 0 0 0 0 0.00157 - 1 0.701 0 0 -0.206 0 0 0 0 -.00237 0 0.908 0.0000 0 0 0 0 0 0 0 0.00149 + 1 0.701 0 0 -0.206 0 0 0 0 -.00237 0 0.908 -0.0000 0 0 0 0 0 0 0 0.00149 2 1.255 0 0 -0.206 0 0 0 0 -.00229 0 1.460 0.0000 0 0 0 0 0 0 0 0.00294 3 0 0 0 -0.206 0 0 0 0 -.00227 0 0.208 0.0000 0 0 0 0 0 0 0 .000930 4 0.410 0 0 -0.206 0 0 0 0 -.00224 0 0.617 -0.0000 0 0 0 0 0 0 0 0.00171 5 1.363 0 0 -0.206 0 0 0 0 -.00219 0 1.567 0.0000 0 0 0 0 0 0 0 0.00380 6 1.373 0 0 -0.206 0 0 0 0 -.00210 0 1.577 0.0000 0 0 0 0 0 0 0 0.00524 1 0.932 0 0 -0.206 0 0 0 0 -.00203 0 1.137 0.0000 0 0 0 0 0 0 0 0.00412 - 2 1.340 0 0 -0.206 0 0 0 1.137 -.00193 0 0.403 -0.0000 0 0 0 0 0 0 0 0.00772 + 2 1.340 0 0 -0.206 0 0 0 1.137 -.00193 0 0.403 0.0000 0 0 0 0 0 0 0 0.00772 3 1.641 0 0 -0.206 0 0 0 11.374 -.00223 0 -9.524 -0.0000 0 0 0 0 0 0 0 .000466 4 5.273 0 0 -0.206 0 0 0 11.374 -.00253 0 -5.848 -0.0000 0 0 0 0 0 0 0 -0.0438 5 2.540 0 0 -0.206 0 0 0 2.916 -.00289 0 -0.158 -0.0000 0 0 0 0 0 0 0 -.00803 - 6 9.835 0 0 -0.206 0 0 0 0 -.00244 0 10.043 0.0000 0 0 0 0 0 0 0 .000064 + 6 9.835 0 0 -0.206 0 0 0 0 -.00244 0 10.043 -0.0000 0 0 0 0 0 0 0 .000064 1 3.851 0 0 -0.206 0 0 0 10.236 -.00230 0 -6.177 -0.0000 0 0 0 0 0 0 0 .000158 2 0.672 0 0 -0.206 0 0 0 7.305 -.00283 0 -6.424 0.0000 0 0 0 0 0 0 0 -.00007 3 7.035 0 0 -0.206 0 0 0 0 -.00273 0 7.244 -0.0000 0 0 0 0 0 0 0 .000038 4 6.055 0 0 -0.206 0 0 0 0 -.00230 0 6.264 0 0 0 0 0 0 0 0 .000075 5 0.557 0 0 -0.206 0 0 0 0 -.00218 0 0.765 0.0000 0 0 0 0 0 0 0 .000036 6 1.466 0 0 -0.206 0 0 0 1.137 -.00213 0 0.537 -0.0000 0 0 0 0 0 0 0 .000198 - 1 0.283 0 0 -0.206 0 0 0 11.374 -.00242 0 -10.882 0.0000 0 0 0 0 0 0 0 .000135 + 1 0.283 0 0 -0.206 0 0 0 11.374 -.00242 0 -10.882 -0.0000 0 0 0 0 0 0 0 .000135 2 0.134 0 0 -0.206 0 0 0 4.275 -.00291 0 -3.932 0.0000 0 0 0 0 0 0 0 -.00018 3 0 0 0 -0.206 0 0 0 0 -.00295 0 0.209 -0.0000 0 0 0 0 0 0 0 .000005 4 0 0 0 -0.206 0 0 0 0 -.00294 0 0.209 0.0000 0 0 0 0 0 0 0 .000005 @@ -2199,14 +2199,14 @@ Subhourly User-defined Report, Fri 02-Jan 2 2.606 0 0 -0.206 0 0 0 0 -.00271 0 2.815 0.0000 0 0 0 0 0 0 0 .000025 3 3.512 0 0 -0.206 0 0 0 0 -.00247 0 3.721 0.0000 0 0 0 0 0 0 0 .000069 4 1.977 0 0 -0.206 0 0 0 0 -.00234 0 2.185 0.0000 0 0 0 0 0 0 0 .000132 - 5 0.0269 0 0 -0.206 0 0 0 0 -.00230 0 0.235 -0.0000 0 0 0 0 0 0 0 .000046 + 5 0.0269 0 0 -0.206 0 0 0 0 -.00230 0 0.235 0.0000 0 0 0 0 0 0 0 .000046 6 0 0 0 -0.206 0 0 0 0 -.00230 0 0.208 0.0000 0 0 0 0 0 0 0 .000055 1 0.144 0 0 -0.206 0 0 0 0 -.00229 0 0.352 -0.0000 0 0 0 0 0 0 0 .000091 2 0 0 0 -0.206 0 0 0 0 -.00227 0 0.208 0.0000 0 0 0 0 0 0 0 .000098 3 0.447 0 0 -0.206 0 0 0 0 -.00225 0 0.655 0.0000 0 0 0 0 0 0 0 .000230 4 0.471 0 0 -0.206 0 0 0 0 -.00221 0 0.679 0.0000 0 0 0 0 0 0 0 .000379 - 5 1.039 0 0 -0.206 0 0 0 0 -.00217 0 1.247 -0.0000 0 0 0 0 0 0 0 .000785 - 6 0.182 0 0 -0.206 0 0 0 0 -.00214 0 0.390 0.0000 0 0 0 0 0 0 0 .000446 + 5 1.039 0 0 -0.206 0 0 0 0 -.00217 0 1.247 0.0000 0 0 0 0 0 0 0 .000785 + 6 0.182 0 0 -0.206 0 0 0 0 -.00214 0 0.390 -0.0000 0 0 0 0 0 0 0 .000446 1 0 0 0 -0.206 0 0 0 0 -.00212 0 0.208 0.0000 0 0 0 0 0 0 0 .000506 2 1.270 0 0 -0.206 0 0 0 0 -.00208 0 1.476 -0.0000 0 0 0 0 0 0 0 0.00270 3 1.698 0 0 -0.206 0 0 0 0 -.00197 0 1.901 0.0000 0 0 0 0 0 0 0 0.00553 @@ -2225,7 +2225,7 @@ Subhourly User-defined Report, Fri 02-Jan 4 0 0 0 -0.206 0 0 0 0 -.00279 0 0.209 0.0000 0 0 0 0 0 0 0 .000007 5 0.181 0 0 -0.206 0 0 0 0 -.00277 0 0.390 -0.0000 0 0 0 0 0 0 0 .000009 6 0 0 0 -0.206 0 0 0 0 -.00276 0 0.209 -0.0000 0 0 0 0 0 0 0 .000009 - 1 0 0 0 -0.206 0 0 0 0 -.00275 0 0.209 0.0000 0 0 0 0 0 0 0 .000010 + 1 0 0 0 -0.206 0 0 0 0 -.00275 0 0.209 -0.0000 0 0 0 0 0 0 0 .000010 2 0 0 0 -0.206 0 0 0 0 -.00274 0 0.209 -0.0000 0 0 0 0 0 0 0 .000011 3 0.509 0 0 -0.206 0 0 0 0 -.00272 0 0.717 0.0000 0 0 0 0 0 0 0 .000025 4 0 0 0 -0.206 0 0 0 0 -.00269 0 0.209 0.0000 0 0 0 0 0 0 0 .000021 @@ -2234,7 +2234,7 @@ Subhourly User-defined Report, Fri 02-Jan 1 0 0 0 -0.206 0 0 0 0 -.00252 0 0.209 0.0000 0 0 0 0 0 0 0 .000078 2 0.305 0 0 -0.206 0 0 0 0 -.00250 0 0.514 0.0000 0 0 0 0 0 0 0 .000156 3 1.129 0 0 -0.206 0 0 0 0 -.00244 0 1.337 -0.0000 0 0 0 0 0 0 0 .000477 - 4 0.166 0 0 -0.206 0 0 0 0 -.00241 0 0.374 -0.0000 0 0 0 0 0 0 0 .000235 + 4 0.166 0 0 -0.206 0 0 0 0 -.00241 0 0.374 0.0000 0 0 0 0 0 0 0 .000235 5 0 0 0 -0.206 0 0 0 0 -.00239 0 0.208 0.0000 0 0 0 0 0 0 0 .000213 6 0.785 0 0 -0.206 0 0 0 0 -.00236 0 0.993 0.0000 0 0 0 0 0 0 0 .000650 1 8.044 0 0 -0.206 0 0 0 2.275 -.00209 0 5.954 0 0 0 0 0 0 0 0 0.0227 @@ -2242,11 +2242,11 @@ Subhourly User-defined Report, Fri 02-Jan 3 3.101 0 0 -0.206 0 0 0 11.374 -.00253 0 -8.063 -0.0000 0 0 0 0 0 0 0 -.00097 4 0.558 0 0 -0.206 0 0 0 3.010 -.00292 0 -2.234 -0.0000 0 0 0 0 0 0 0 -.00912 5 0 0 0 -0.206 0 0 0 0 -.00293 0 0.209 0.0000 0 0 0 0 0 0 0 .000005 - 6 0.706 0 0 -0.206 0 0 0 0 -.00290 0 0.916 0.0000 0 0 0 0 0 0 0 .000008 + 6 0.706 0 0 -0.206 0 0 0 0 -.00290 0 0.916 -0.0000 0 0 0 0 0 0 0 .000008 1 0.894 0 0 -0.206 0 0 0 0 -.00282 0 1.103 0.0000 0 0 0 0 0 0 0 .000006 2 1.220 0 0 -0.206 0 0 0 0 -.00276 0 1.429 0.0000 0 0 0 0 0 0 0 .000013 3 0.216 0 0 -0.206 0 0 0 0 -.00271 0 0.425 0.0000 0 0 0 0 0 0 0 .000008 - 4 0 0 0 -0.206 0 0 0 0 -.00270 0 0.209 -0.0000 0 0 0 0 0 0 0 .000008 + 4 0 0 0 -0.206 0 0 0 0 -.00270 0 0.209 0.0000 0 0 0 0 0 0 0 .000008 5 0 0 0 -0.206 0 0 0 0 -.00269 0 0.209 -0.0000 0 0 0 0 0 0 0 .000009 6 0.507 0 0 -0.206 0 0 0 0 -.00266 0 0.716 0.0000 0 0 0 0 0 0 0 .000015 1 0.593 0 0 -0.206 0 0 0 0 -.00264 0 0.802 0.0000 0 0 0 0 0 0 0 .000025 @@ -2267,8 +2267,8 @@ Subhourly User-defined Report, Fri 02-Jan 4 0 0 0 -0.206 0 0 0 5.928 -.00286 0 -5.702 -0.0000 0 0 0 0 0 0 0 -0.0171 5 0 0 0 -0.206 0 0 0 0 -.00295 0 0.209 -0.0000 0 0 0 0 0 0 0 .000005 6 0 0 0 -0.206 0 0 0 0 -.00294 0 0.209 -0.0000 0 0 0 0 0 0 0 .000005 - 1 0 0 0 -0.206 0 0 0 0 -.00293 0 0.209 -0.0000 0 0 0 0 0 0 0 .000001 - 2 0 0 0 -0.206 0 0 0 0 -.00292 0 0.209 0.0000 0 0 0 0 0 0 0 .000005 + 1 0 0 0 -0.206 0 0 0 0 -.00293 0 0.209 0.0000 0 0 0 0 0 0 0 .000001 + 2 0 0 0 -0.206 0 0 0 0 -.00292 0 0.209 -0.0000 0 0 0 0 0 0 0 .000005 3 0 0 0 -0.206 0 0 0 0 -.00291 0 0.209 0.0000 0 0 0 0 0 0 0 .000006 4 0 0 0 -0.206 0 0 0 0 -.00289 0 0.209 0.0000 0 0 0 0 0 0 0 .000006 5 0 0 0 -0.206 0 0 0 0 -.00288 0 0.209 0.0000 0 0 0 0 0 0 0 .000006 @@ -2280,22 +2280,22 @@ Subhourly User-defined Report, Fri 02-Jan ! Log for Run 002: -! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.bf0cee46.45 for Win32 console +! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console -! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.bf0cee46.45 for Win32 console run(s) done: Tue 09-Jan-24 1:41:53 pm +! CSE 0.921.0+add-generic-models-hpwh.bebd72cd.145 for Win32 console run(s) done: Mon 15-Apr-24 12:07:25 pm -! Executable: c:\users\phil ahrenkiel\documents\github\cse\msvc\cse.exe -! 09-Jan-24 1:36 pm (VS 14.29 2885120 bytes) (HPWH 1.22.0+fix-external-heat-energy-balance.1b5b6d4.209) +! 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_brwl ! Input file: C:\Users\Phil Ahrenkiel\Documents\GitHub\cse\test\dhw_brwl.cse ! Report file: C:\USERS\PHIL AHRENKIEL\DOCUMENTS\GITHUB\CSE\TEST\DHW_BRWL.REP ! Timing info -- -! Input: Time = 1.40 Calls = 2 T/C = 0.7000 +! Input: Time = 0.80 Calls = 2 T/C = 0.4010 ! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000 -! Simulation: Time = 4.51 Calls = 2 T/C = 2.2550 -! Reports: Time = 0.01 Calls = 2 T/C = 0.0070 -! Total: Time = 5.94 Calls = 1 T/C = 5.9440 +! Simulation: Time = 3.74 Calls = 2 T/C = 1.8705 +! Reports: Time = 0.01 Calls = 2 T/C = 0.0060 +! Total: Time = 4.56 Calls = 1 T/C = 4.5580 diff --git a/test/ref-win32-msvc/DHW_ZONE.REP b/test/ref-win32-msvc/DHW_ZONE.REP index c639d39f4..5447f2e68 100644 --- a/test/ref-win32-msvc/DHW_ZONE.REP +++ b/test/ref-win32-msvc/DHW_ZONE.REP @@ -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 @@ -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 ================ @@ -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 @@ -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 diff --git a/test/ref-win32-msvc/dhwloop32U.rep b/test/ref-win32-msvc/dhwloop32U.rep index faa4f171e..40abc17dd 100644 --- a/test/ref-win32-msvc/dhwloop32U.rep +++ b/test/ref-win32-msvc/dhwloop32U.rep @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 From cef929db78e9a7fa4bde1b96a07b9ec909768db9 Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Thu, 18 Apr 2024 13:01:42 -0600 Subject: [PATCH 5/6] Add GenericUEF217 model. --- src/CNDTYPES.DEF | 2 ++ src/RCDEF/rcdef.cpp | 2 +- src/dhwcalc.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF index 454a21752..3e8b7ea83 100644 --- a/src/CNDTYPES.DEF +++ b/src/CNDTYPES.DEF @@ -524,6 +524,8 @@ 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 diff --git a/src/RCDEF/rcdef.cpp b/src/RCDEF/rcdef.cpp index f8bab93d5..d56e84c8e 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=104; // 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. diff --git a/src/dhwcalc.cpp b/src/dhwcalc.cpp index fc09dc770..7ee6e68bd 100644 --- a/src/dhwcalc.cpp +++ b/src/dhwcalc.cpp @@ -3113,6 +3113,7 @@ 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 }, From f0445ca5efed5f830ea712bf7672475a347c76fb Mon Sep 17 00:00:00 2001 From: Phil Ahrenkiel Date: Mon, 22 Apr 2024 15:24:25 -0600 Subject: [PATCH 6/6] Update HPHWsim. --- vendor/HPWHsim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/HPWHsim b/vendor/HPWHsim index b9efd3b13..2c3b1992e 160000 --- a/vendor/HPWHsim +++ b/vendor/HPWHsim @@ -1 +1 @@ -Subproject commit b9efd3b136c038dfb6d4bfb5b2c836ed79f5d9e9 +Subproject commit 2c3b1992ee2322c3024286c478908d75d9d1b00b