Skip to content

Initialize HPWHsim presets from embedded CBOR #551

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

Open
wants to merge 52 commits into
base: main
Choose a base branch
from
Open

Initialize HPWHsim presets from embedded CBOR #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
55c4b7c
Update HPWHsim.
spahrenk May 28, 2025
6b599a4
Update HPWHsim.
spahrenk May 29, 2025
e56a092
Update refs.
spahrenk May 29, 2025
b9415bf
Replace one ref.
spahrenk May 29, 2025
cc39a6b
Install uv in CI.
Jun 2, 2025
14f2495
Fix branch.
Jun 2, 2025
b0acc84
Updaet HPWHsim.
spahrenk Jun 2, 2025
5e2a5f5
Update HPWHsim.
spahrenk Jun 3, 2025
51b7e9a
Replace Mac refs.
spahrenk Jun 4, 2025
53dae41
Update HPWHsim.
Jun 4, 2025
17a461a
Updaate HPWHsim.
Jun 4, 2025
fb6961f
Update win32 refs.
Jun 4, 2025
a4215d7
Merge branch 'init-presets-from-cbor-hpwh' of https://github.com/cse-…
Jun 4, 2025
d9fdddf
Replace mac refs.
spahrenk Jun 4, 2025
01462e6
Update HPWHsim.
spahrenk Jun 4, 2025
70a6a29
Update HPWHsim.
Jun 9, 2025
8eb32eb
Merge branch 'init-presets-from-cbor-hpwh' of https://github.com/cse-…
Jun 9, 2025
31c9c9a
Merge branch 'main' into init-presets-from-cbor-hpwh
Jun 9, 2025
f55dac4
Change fnc. args.
Jun 13, 2025
2777351
Update dhwx.rep
Jun 13, 2025
70deaa3
Update HPWHsim.
Jun 13, 2025
85c1b72
Update HPWHsim; iclean-up model names.
Jun 19, 2025
3783a22
Update HPWHsim.
Jun 19, 2025
11107d8
Update HPWHsim.
Jun 19, 2025
9911c81
Change PolySet scope.
Jun 20, 2025
e86136a
Change uv/python workflow.
Jun 20, 2025
ad8f8e9
Adjust Sanco names; restore ref.
Jun 20, 2025
93cb265
Fix Sanco model #s.
Jun 21, 2025
e8e1563
Merge remote-tracking branch 'origin/main' into init-presets-from-cbo…
spahrenk Jun 21, 2025
ec27ad9
Use alternate HPWHsim.
Jun 27, 2025
bfce43f
Replace ref.
Jun 27, 2025
327c2c7
Update HPWHsim.
Jun 30, 2025
3143701
Replace refs.
spahrenk Jun 30, 2025
be93e3b
Update HPWHsim.
Jun 30, 2025
f4dc753
Update HPWHsim.
Jun 30, 2025
8399df7
Update workflow.
Jul 2, 2025
9911ab0
Update HPWHsim.
Jul 8, 2025
a3240ac
Update HPWHsim.
Jul 8, 2025
6f1d99c
Replace refs.
Jul 8, 2025
a5f2a27
Update HPWHsim.
Jul 9, 2025
310f6e6
Merge remote-tracking branch 'origin/main' into init-presets-from-cbo…
spahrenk Jul 9, 2025
8ca0b3a
Update HPWHsim.
Jul 17, 2025
324c7f5
Update HPWHsim.
Aug 21, 2025
b234dde
Update HPWHsim.
spahrenk Aug 21, 2025
1ea69b8
Use HPWHsim main.
Sep 30, 2025
c1433da
Install uv for documentation workflow.
spahrenk Sep 30, 2025
8309e6a
Disable uv cache.
spahrenk Sep 30, 2025
5755f62
Fix disable chache.
spahrenk Sep 30, 2025
d5f6edf
Merge main.
nealkruis Oct 14, 2025
247804f
Update reference file.
nealkruis Oct 14, 2025
9701755
Detect "Tier4" (for now) and restore report file.
nealkruis Oct 15, 2025
a821daa
Update report file again for tiny difference.
nealkruis Oct 15, 2025
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
285 changes: 144 additions & 141 deletions src/dhwcalc.cpp
View file
Open in desktop

Large diffs are not rendered by default.

2,120 changes: 1,060 additions & 1,060 deletions test/ref-win32-msvc/CHDHW.REP
View file
Open in desktop

Large diffs are not rendered by default.

148 changes: 74 additions & 74 deletions test/ref-win32-msvc/DHW_AQUATHERMAIRE.REP
View file
Open in desktop

Large diffs are not rendered by default.

96 changes: 48 additions & 48 deletions test/ref-win32-msvc/DHW_MFSIZING.REP
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 10 additions & 10 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 @@ -1284,7 +1284,7 @@ Daily User-defined Report, Jan
11 51.672 0 -37.93 0 0 0 0 81.488 -3.500 4.606 0.0917 0.0000 0 0 0 0 0 6.907 0 0.00277
12 51.608 0 -38.23 0 0 0 0 80.370 -3.613 3.583 1.871 -0.0000 0 0 0 0 0 7.620 0 0.00298
13 51.670 0 -38.48 0 0 0 0 79.975 -3.419 3.839 0.699 -0.0000 0 0 0 0 0 9.059 0 0.00146
14 51.858 0 -39.10 0 0 0 0 77.951 -3.252 7.165 -0.772 -0.0000 0 0 0 0 0 9.868 0 .000003
14 51.858 0 -39.10 0 0 0 0 77.951 -3.252 7.165 -0.772 0.0000 0 0 0 0 0 9.868 0 .000003
15 51.959 0 -38.89 0 0 0 0 78.627 -3.313 7.165 -0.773 -0.0000 0 0 0 0 0 9.145 0 .000003
16 52.013 0 -38.85 0 0 0 0 78.466 -3.379 6.654 0.620 -0.0000 0 0 0 0 0 8.500 0 0.00121
17 52.045 0 -39.17 0 0 0 0 77.774 -3.285 7.165 0.117 -0.0000 0 0 0 0 0 9.445 0 .000114
Expand All @@ -1295,12 +1295,12 @@ Daily User-defined Report, Jan
22 52.078 0 -38.81 0 0 0 0 70.203 -4.035 22.043 0.948 -0.0000 0 0 0 0 0 1.724 0 -.00052
23 52.104 0 -39.04 0 0 0 0 63.341 -4.042 28.716 0.583 -0.0000 0 0 0 0 0 2.550 0 0.00111
24 52.173 0 -39.19 0 0 0 0 77.694 -3.297 7.165 0.487 0.0000 0 0 0 0 0 9.313 0 .000202
25 52.128 0 -38.87 0 0 0 0 78.492 -3.305 7.365 -0.138 -0.0000 0 0 0 0 0 8.582 0 .000393
25 52.128 0 -38.87 0 0 0 0 78.492 -3.305 7.365 -0.138 0.0000 0 0 0 0 0 8.582 0 .000393
26 51.976 0 -39.38 0 0 0 0 69.923 -3.811 17.437 1.270 -0.0000 0 0 0 0 0 6.532 0 0.00344
27 52.011 0 -38.86 0 0 0 0 78.757 -3.313 5.886 0.00454 -0.0000 0 0 0 0 0 9.541 0 .000247
28 52.178 0 -38.39 0 0 0 0 80.150 -3.333 7.165 -1.917 -0.0000 0 0 0 0 0 8.503 0 .000001
29 52.226 0 -39.01 0 0 0 0 76.444 -3.629 11.374 0.129 -0.0000 0 0 0 0 0 6.918 0 .000721
30 52.292 0 -38.53 0 0 0 0 79.343 -3.414 6.910 0.148 -0.0000 0 0 0 0 0 7.836 0 .000944
30 52.292 0 -38.53 0 0 0 0 79.343 -3.414 6.910 0.148 0.0000 0 0 0 0 0 7.836 0 .000944
31 52.328 0 -38.83 0 0 0 0 78.738 -3.280 7.165 -0.0254 -0.0000 0 0 0 0 0 8.559 0 .000601

Mon 1605.01 0 -1203 0 0 0 0 2299.58 -109.98 395.73 0.581 -0.0000 0 0 0 0 0 222.316 0 0.0314
Expand All @@ -1310,7 +1310,7 @@ Daily User-defined Report, Jan
! Log for Run 001:

################
! CSE 0.925.0+use-weighted-dist-hpwh.63882773.5 for Win32 console Wed 23-Apr-25 5:1 pm
! CSE 0.926.0+init-presets-from-cbor-hpwh.a3240acd.38 for Win32 console Tue 08-Jul-25 9:4 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=12148.08 Dair=147.67 Nrad=108974.69 Drad=1360.41 CX=187.50 airX=0.000
ta=81.13 tr=80.23 qIzSh=0 fvent=0.000 pz0=0.0005 qsHvac=0
! CSE 0.925.0+use-weighted-dist-hpwh.63882773.5 for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.a3240acd.38 for Win32 console



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



! CSE 0.925.0+use-weighted-dist-hpwh.63882773.5 for Win32 console run(s) done: Wed 23-Apr-25 5:1 pm
! CSE 0.926.0+init-presets-from-cbor-hpwh.a3240acd.38 for Win32 console run(s) done: Tue 08-Jul-25 9:4 pm

! Executable: d:\a\cse\cse\build\cse.exe
! 23-Apr-25 5:1 pm (VS 14.29 3347456 bytes) (HPWH 1.25.0+HEAD.650de7eb.420)
! 08-Jul-25 9:4 pm (VS 14.29 3562496 bytes) (HPWH 1.26.0+HEAD.99f74aaf.226)
! Command line: -x! -b -t1 dhw_zone
! Input file: D:\a\cse\cse\test\dhw_zone.cse
! Report file: D:\A\CSE\CSE\TEST\DHW_ZONE.REP

! Timing info --

! Input: Time = 0.07 Calls = 1 T/C = 0.0690
! Input: Time = 0.07 Calls = 1 T/C = 0.0730
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 2.38 Calls = 1 T/C = 2.3770
! Simulation: Time = 3.17 Calls = 1 T/C = 3.1710
! Reports: Time = 0.01 Calls = 1 T/C = 0.0050
! Total: Time = 2.45 Calls = 1 T/C = 2.4520
! Total: Time = 3.25 Calls = 1 T/C = 3.2500
54 changes: 27 additions & 27 deletions test/ref-win32-msvc/commands.rep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Hourly Energy Balance, zone "Z2", Wed 10-Jul

! Log for Run 001:

! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console



Expand Down Expand Up @@ -505,7 +505,7 @@ Hourly Energy Balance, zone "Z2", Wed 10-Jul

! Log for Run 002:

! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console



Expand Down Expand Up @@ -814,7 +814,7 @@ Hourly Energy Balance, zone "Z2", Wed 10-Jul

! Log for Run 003:

! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console



Expand Down Expand Up @@ -962,7 +962,7 @@ Hourly Energy Balance, zone "Z3", Wed 10-Jul

! Log for Run 004:

! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console



Expand All @@ -985,18 +985,18 @@ Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan
--- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------
Jan 0.661 0 0 0 0.554 0.107 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Feb 0.547 0 0 0 0.497 0.0496 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Mar 0.552 0 0 0 0.507 0.0442 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 0.543 0 0 0 0.455 0.0875 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Mar 0.551 0 0 0 0.507 0.0442 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 0.542 0 0 0 0.455 0.0875 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
May 0.478 0 0 0 0.429 0.0493 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 0.456 0 0 0 0.400 0.0567 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 0.427 0 0 0 0.383 0.0436 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 0.456 0 0 0 0.399 0.0567 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 0.426 0 0 0 0.383 0.0436 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 0.407 0 0 0 0.375 0.0325 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 0.421 0 0 0 0.389 0.0319 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 0.420 0 0 0 0.388 0.0319 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 0.427 0 0 0 0.396 0.0312 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Nov 0.525 0 0 0 0.481 0.0437 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Dec 0.623 0 0 0 0.508 0.114 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

Yr 6.066 0 0 0 5.375 0.691 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Yr 6.064 0 0 0 5.373 0.691 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0



Expand Down Expand Up @@ -1432,7 +1432,7 @@ Day Total Unknown Faucet Shower Bath CWashr DWashr

! Log for Run 005:

! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console



Expand Down Expand Up @@ -2599,15 +2599,15 @@ Feb 0.871 0 0 0 0.474 0.397 0 0 0 0 0
Mar 0.833 0 0 0 0.593 0.240 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 0.826 0 0 0 0.555 0.271 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
May 0.597 0 0 0 0.505 0.0926 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 0.511 0 0 0 0.468 0.0432 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 0.511 0 0 0 0.467 0.0432 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 0.477 0 0 0 0.430 0.0469 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 0.446 0 0 0 0.403 0.0438 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 0.461 0 0 0 0.427 0.0333 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 0.531 0 0 0 0.441 0.0901 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 0.447 0 0 0 0.403 0.0438 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 0.460 0 0 0 0.427 0.0333 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 0.531 0 0 0 0.440 0.0901 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Nov 0.740 0 0 0 0.498 0.242 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Dec 0.851 0 0 0 0.499 0.353 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

Yr 8.167 0 0 0 5.821 2.345 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Yr 8.165 0 0 0 5.820 2.345 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0



Expand Down Expand Up @@ -3043,7 +3043,7 @@ Day Total Unknown Faucet Shower Bath CWashr DWashr

! Log for Run 006:

! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console



Expand All @@ -3064,18 +3064,18 @@ Input for Run 006:



! CSE 0.922.1+perfmap.7b21cfab.13.dirty for Win32 console run(s) done: Fri 10-May-24 2:13:41 pm
! CSE 0.926.0+init-presets-from-cbor-hpwh.327c2c73.32 for Win32 console run(s) done: Mon 30-Jun-25 6:0 pm

! Executable: d:\cse\builds\cse.exe
! 10-May-24 2:07 pm (VS 14.29 2921984 bytes) (HPWH 1.23.0+HEAD.db504de.130)
! Command line: -x! -t1 commands
! Input file: D:\cse\test\commands.cse
! Report file: D:\CSE\TEST\COMMANDS.REP
! Executable: d:\a\cse\cse\build\cse.exe
! 30-Jun-25 6:0 pm (VS 14.29 3561984 bytes) (HPWH 1.26.0+HEAD.f991c214.216)
! Command line: -x! -b -t1 commands
! Input file: D:\a\cse\cse\test\commands.cse
! Report file: D:\A\CSE\CSE\TEST\COMMANDS.REP

! Timing info --

! Input: Time = 0.28 Calls = 6 T/C = 0.0463
! Input: Time = 0.48 Calls = 6 T/C = 0.0800
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 5.92 Calls = 6 T/C = 0.9868
! Reports: Time = 0.01 Calls = 6 T/C = 0.0010
! Total: Time = 6.22 Calls = 1 T/C = 6.2220
! Simulation: Time = 8.92 Calls = 6 T/C = 1.4868
! Reports: Time = 0.00 Calls = 6 T/C = 0.0007
! Total: Time = 9.41 Calls = 1 T/C = 9.4070
Loading