Skip to content

Commit

Permalink
Merge pull request #468 from cse-sim/hpwh-btwxt
Browse files Browse the repository at this point in the history 
Update submodules
  • Loading branch information
@chipbarnaby
chipbarnaby authored Feb 21, 2024
2 parents 650637e + c5a6a27 commit e33180b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
36 changes: 18 additions & 18 deletions test/ref/dhwloop32U.rep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -922,19 +922,19 @@ Hourly User-defined Report, Wed 04-Feb
9 108.130 0 -0.641 -5.270 0 0 0 59.965 -0.866 0 59.022 0.0000 0 -0.0202 0 -4.059 -0.0000 0 0 -.00019
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
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
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
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
17 20.763 0 -0.510 -5.248 0 0 0 0 -1.610 0 25.980 0.0000 0 -0.0194 0 2.168 -0.0000 0 0 0.00342
18 14.501 0 -0.507 -5.246 0 0 0 0 -1.522 0 18.601 0.0000 0 -0.0191 0 3.189 -0.0000 0 0 0.00447
19 38.159 0 -0.534 -5.253 0 0 0 0 -1.361 0 45.422 0.0000 0 -0.0191 0 -0.121 -0.0000 0 0 0.0254
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
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
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
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 @@ -966,7 +966,7 @@ Hourly User-defined Report, Fri 10-Jul
20 11.953 0 -0.351 -5.246 0 0 0 0 -0.388 0 14.912 -0.0000 0 -0.0185 0 3.030 -0.0000 0 0 0.0144
21 6.940 0 -0.353 -5.244 0 0 0 0 -0.329 0 9.025 -0.0000 0 -0.0182 0 3.842 0.0000 0 0 0.0171
22 34.692 0 -0.406 -5.255 0 0 0 74.276 -0.346 0 -29.587 0.0000 0 -0.0182 0 -3.934 -0.0000 0 0 -0.0374
23 5.729 0 -0.381 -5.243 0 0 0 84.182 -0.611 0 -75.728 0.0000 0 -0.0182 0 3.528 -0.0000 0 0 .000006
23 5.729 0 -0.381 -5.243 0 0 0 84.182 -0.611 0 -75.728 -0.0000 0 -0.0182 0 3.528 -0.0000 0 0 .000006
24 2.386 0 -0.384 -5.241 0 0 0 75.732 -0.977 0 -71.196 0.0000 0 -0.0178 0 4.468 -0.0000 0 0 0.00261

Day 413.159 0 -25.97 -125.9 0 0 0 526.320 -18.733 0 13.284 0.0000 39.077 -0.449 0 5.638 -0.0000 0.0250 0 -0.0875
Expand All @@ -975,7 +975,7 @@ Hourly User-defined Report, Fri 10-Jul

! Log for Run 001:

! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.bf0cee46.45 for Win32 console
! CSE 0.921.0+hpwh-btwxt.a1147865.56 for Win32 console



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



! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.bf0cee46.45 for Win32 console run(s) done: Tue 09-Jan-24 1:42:06 pm
! CSE 0.921.0+hpwh-btwxt.a1147865.56 for Win32 console run(s) done: Wed 21-Feb-24 12:59:56 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)
! 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
! Executable: d:\cse\msvc\cse.exe
! 21-Feb-24 12:38 pm (VS 14.29 2873344 bytes) (HPWH 1.23.0+main.4609465.28)
! Command line: -x! -t1 dhwloop32U
! Input file: D:\cse\test\dhwloop32U.cse
! Report file: D:\CSE\TEST\DHWLOOP32U.REP

! Timing info --

! Input: Time = 1.14 Calls = 1 T/C = 1.1360
! Input: Time = 0.42 Calls = 1 T/C = 0.4180
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 12.20 Calls = 1 T/C = 12.1960
! Reports: Time = 0.03 Calls = 1 T/C = 0.0300
! Total: Time = 13.36 Calls = 1 T/C = 13.3640
! Simulation: Time = 5.12 Calls = 1 T/C = 5.1220
! Reports: Time = 0.01 Calls = 1 T/C = 0.0050
! Total: Time = 5.55 Calls = 1 T/C = 5.5490
2 changes: 1 addition & 1 deletion vendor/HPWHsim
Submodule HPWHsim updated 31 files
+31 −32 src/HPWH.cc
+10 −6 src/HPWH.hh
+229 −133 src/HPWHHeatSources.cc
+33 −39 src/HPWHHeatingLogics.cc
+1 −1 src/HPWHpresets.cc
+9 −9 test/ref/DHW_YRLY.csv
+495 −495 test/ref/testLargeComp45_Preset_ColmacCxA_20_MP.csv
+498 −498 test/ref/testLargeComp45_Preset_ColmacCxV_5_MP.csv
+469 −469 test/ref/testLargeComp45_Preset_NyleC250A_C_MP.csv
+469 −469 test/ref/testLargeComp45_Preset_NyleC250A_MP.csv
+494 −494 test/ref/testLargeComp45_Preset_NyleC90A_C_MP.csv
+494 −494 test/ref/testLargeComp45_Preset_NyleC90A_MP.csv
+496 −496 test/ref/testLargeComp45_Preset_RheemHPHD135.csv
+491 −491 test/ref/testLargeComp45_Preset_RheemHPHD60.csv
+495 −495 test/ref/testLargeComp60_Preset_ColmacCxA_20_MP.csv
+498 −498 test/ref/testLargeComp60_Preset_ColmacCxV_5_MP.csv
+469 −469 test/ref/testLargeComp60_Preset_NyleC250A_C_MP.csv
+469 −469 test/ref/testLargeComp60_Preset_NyleC250A_MP.csv
+494 −494 test/ref/testLargeComp60_Preset_NyleC90A_C_MP.csv
+494 −494 test/ref/testLargeComp60_Preset_NyleC90A_MP.csv
+493 −493 test/ref/testLargeComp60_Preset_RheemHPHD135.csv
+491 −491 test/ref/testLargeComp60_Preset_RheemHPHD60.csv
+795 −795 test/ref/testLargeCompHot_Preset_ColmacCxA_20_MP.csv
+798 −798 test/ref/testLargeCompHot_Preset_ColmacCxV_5_MP.csv
+767 −767 test/ref/testLargeCompHot_Preset_NyleC250A_C_MP.csv
+759 −759 test/ref/testLargeCompHot_Preset_NyleC250A_MP.csv
+784 −784 test/ref/testLargeCompHot_Preset_NyleC90A_C_MP.csv
+784 −784 test/ref/testLargeCompHot_Preset_NyleC90A_MP.csv
+775 −775 test/ref/testLargeCompHot_Preset_RheemHPHD135.csv
+624 −624 test/ref/testLargeCompHot_Preset_RheemHPHD60.csv
+1 −1 vendor/btwxt

0 comments on commit e33180b

Please sign in to comment.