Skip to content

Commit

Permalink
Merge branch 'main' into heat-exchange-models-hpwh
Browse files Browse the repository at this point in the history
  • Loading branch information
Phil Ahrenkiel authored and Phil Ahrenkiel committed Dec 11, 2023
2 parents 86196e3 + bddde1e commit 3a4adde
Show file tree
Hide file tree
Showing 13 changed files with 19,651 additions and 19,658 deletions.
3,190 changes: 1,595 additions & 1,595 deletions test/ref/CHDHW.REP
View file

Large diffs are not rendered by default.

28,136 changes: 14,068 additions & 14,068 deletions test/ref/DHWDU.rep
View file

Large diffs are not rendered by default.

812 changes: 406 additions & 406 deletions test/ref/DHW_BRWL.REP
View file

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions test/ref/DHW_C.REP
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ Monthly Energy Use, meter "Elec0"

Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan Aux Proc Lit Rcp Ext Refr Dish Dry Wash Cook User1 User2 BT PV
--- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------
Jan 2.308 0 0 0 1.237 1.072 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Feb 2.060 0 0 0 1.156 0.904 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Mar 1.877 0 0 0 1.376 0.501 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 1.925 0 0 0 1.315 0.610 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
May 1.638 0 0 0 1.256 0.382 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 1.326 0 0 0 1.168 0.158 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 1.252 0 0 0 1.147 0.105 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 1.296 0 0 0 1.126 0.170 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 1.268 0 0 0 1.077 0.191 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 1.388 0 0 0 1.231 0.157 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Nov 1.804 0 0 0 1.250 0.554 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Dec 2.335 0 0 0 1.263 1.072 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jan 2.308 0 0 0 1.234 1.074 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Feb 2.060 0 0 0 1.155 0.905 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Mar 1.882 0 0 0 1.369 0.513 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 1.927 0 0 0 1.317 0.611 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
May 1.638 0 0 0 1.254 0.383 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 1.329 0 0 0 1.164 0.165 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 1.260 0 0 0 1.139 0.121 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 1.294 0 0 0 1.121 0.173 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 1.275 0 0 0 1.074 0.201 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 1.389 0 0 0 1.226 0.163 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Nov 1.802 0 0 0 1.247 0.555 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Dec 2.325 0 0 0 1.266 1.058 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

Yr 20.477 0 0 0 14.601 5.876 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Yr 20.489 0 0 0 14.567 5.922 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0



Expand Down Expand Up @@ -88,20 +88,20 @@ Monthly Energy Use, meter "Elec1"

Mon Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan Aux Proc Lit Rcp Ext Refr Dish Dry Wash Cook User1 User2 BT PV
--- ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------ ------
Jan 2.562 0 0 0 1.371 1.191 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Feb 2.167 0 0 0 1.215 0.952 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Mar 1.877 0 0 0 1.376 0.501 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 1.888 0 0 0 1.289 0.598 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
May 1.577 0 0 0 1.209 0.367 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 1.253 0 0 0 1.103 0.149 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 1.161 0 0 0 1.064 0.0968 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 1.236 0 0 0 1.074 0.162 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 1.232 0 0 0 1.046 0.185 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 1.388 0 0 0 1.231 0.157 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Nov 1.898 0 0 0 1.314 0.583 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Dec 2.563 0 0 0 1.386 1.178 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jan 2.562 0 0 0 1.368 1.194 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Feb 2.167 0 0 0 1.214 0.953 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Mar 1.882 0 0 0 1.369 0.513 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Apr 1.890 0 0 0 1.292 0.599 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
May 1.576 0 0 0 1.207 0.369 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jun 1.255 0 0 0 1.099 0.156 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Jul 1.169 0 0 0 1.056 0.112 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Aug 1.234 0 0 0 1.069 0.165 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Sep 1.238 0 0 0 1.043 0.195 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Oct 1.389 0 0 0 1.226 0.163 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Nov 1.895 0 0 0 1.312 0.584 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Dec 2.552 0 0 0 1.389 1.163 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

Yr 20.800 0 0 0 14.679 6.121 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
Yr 20.809 0 0 0 14.645 6.164 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0



Expand Down Expand Up @@ -254,7 +254,7 @@ Yr 0 0 0 0 0 0 0

! Log for Run 001:

! CSE 0.910.0+dhw-fadj.f21ee46c.251.dirty for Win32 console
! CSE 0.920.0+balance-energy-hpwh.b40b2410.2 for Win32 console



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



! CSE 0.910.0+dhw-fadj.f21ee46c.251.dirty for Win32 console run(s) done: Wed 07-Dec-22 11:11:47 am
! CSE 0.920.0+balance-energy-hpwh.b40b2410.2 for Win32 console run(s) done: Wed 06-Dec-23 10:07:08 am

! Executable: d:\cse\msvc\cse.exe
! 07-Dec-22 11:03 am (VS 14.29 2626048 bytes) (HPWH 1.19.0)
! Command line: -x! -t1 dhw_c
! Input file: D:\cse\test\dhw_c.cse
! Report file: D:\cse\test\dhw_c.rep
! Executable: c:\users\phil ahrenkiel\documents\github\cse\msvc\cse.exe
! 06-Dec-23 10:01 am (VS 14.29 2797568 bytes) (HPWH 1.22.0+balance-energy.b3fd546.79)
! Command line: -x! -b -t1 dhw_C
! Input file: C:\Users\Phil Ahrenkiel\Documents\GitHub\cse\test\dhw_C.cse
! Report file: C:\USERS\PHIL AHRENKIEL\DOCUMENTS\GITHUB\CSE\TEST\DHW_C.REP

! Timing info --

! Input: Time = 0.10 Calls = 1 T/C = 0.0950
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 1.42 Calls = 1 T/C = 1.4160
! Reports: Time = 0.00 Calls = 1 T/C = 0.0020
! Total: Time = 1.52 Calls = 1 T/C = 1.5170
! Input: Time = 0.18 Calls = 1 T/C = 0.1830
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
! Simulation: Time = 3.66 Calls = 1 T/C = 3.6600
! Reports: Time = 0.01 Calls = 1 T/C = 0.0060
! Total: Time = 3.85 Calls = 1 T/C = 3.8490
Loading

0 comments on commit 3a4adde

Please sign in to comment.