Skip to content

Commit ec95afb

Browse files
nealkruisnealkruis
authored
Merge pull request #458 from cse-sim/fix-external-heat-energy-balance-hpwh
Fix external heat energy balance hpwh
2 parents e12696d + 879e905 commit ec95afb

File tree

10 files changed

+1442
-1442
lines changed

10 files changed

+1442
-1442
lines changed

‎test/ref/CHDHW.REP‎

Lines changed: 54 additions & 54 deletions
Large diffs are not rendered by default.

‎test/ref/DHWDU.rep‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
! Log for Run 001:
44

5-
! CSE 0.920.0+cmath.37f8f6da.10 for Win32 console
5+
! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.b636cb3f.37 for Win32 console
66

77

88

@@ -7914,7 +7914,7 @@ Hr Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan
79147914
23 2.482 0 0 0 0 0 0 0.154 0 0.0550 0 0 0 0.612 1.023 0.377 0.261 0 0 0 0 0 0 0 0
79157915
24 1.947 0 0 0 0 0 0 0 0 0.0550 0 0 0 0.369 0.885 0.377 0.261 0 0 0 0 0 0 0 0
79167916

7917-
Day 46.069 0 0 0 5.445 0 0 2.150 0 1.321 0 0 0 9.721 19.668 1.509 6.256 0 0 0 0 0 0 0 0
7917+
Day 46.070 0 0 0 5.445 0 0 2.150 0 1.321 0 0 0 9.721 19.668 1.509 6.256 0 0 0 0 0 0 0 0
79187918

79197919

79207920
Hourly Energy Use, meter "MtrElec", Fri 26-Jun
@@ -12482,7 +12482,7 @@ Hr Tot Clg Htg HPBU Dhw DhwBU DhwMFL FanC FanH FanV Fan
1248212482
14 1.585 0 0 0 0 0 0 0 0.0325 0.0550 0 0 0 0.296 0.941 0 0.261 0 0 0 0 0 0 0 0
1248312483
15 1.637 0 0 0 0 0 0 0 0.0271 0.0550 0 0 0 0.296 0.998 0 0.261 0 0 0 0 0 0 0 0
1248412484
16 2.626 0 0 0 0.857 0 0 0 0.0315 0.0550 0 0 0 0.366 1.055 0 0.261 0 0 0 0 0 0 0 0
12485-
17 3.225 0 0 0 1.170 0 0 0 0.0474 0.0550 0 0 0 0.437 1.255 0 0.261 0 0 0 0 0 0 0 0
12485+
17 3.225 0 0 0 1.171 0 0 0 0.0474 0.0550 0 0 0 0.437 1.255 0 0.261 0 0 0 0 0 0 0 0
1248612486
18 2.497 0 0 0 0 0 0 0 0.0492 0.0550 0 0 0 0.620 1.511 0 0.261 0 0 0 0 0 0 0 0
1248712487
19 3.189 0 0 0 0 0 0 0 0.0349 0.0550 0 0 0 1.184 1.654 0 0.261 0 0 0 0 0 0 0 0
1248812488
20 3.720 0 0 0 0 0 0 0 0.0304 0.0550 0 0 0 1.663 1.711 0 0.261 0 0 0 0 0 0 0 0
@@ -60104,7 +60104,7 @@ Hourly Cond Report, Thu 31-Dec
6010460104

6010560105
! Log for Run 002:
6010660106

60107-
! CSE 0.920.0+cmath.37f8f6da.10 for Win32 console
60107+
! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.b636cb3f.37 for Win32 console
6010860108

6010960109

6011060110

@@ -61522,18 +61522,18 @@ Input for Run 001:
6152261522

6152361523

6152461524

61525-
! CSE 0.920.0+cmath.37f8f6da.10 for Win32 console run(s) done: Mon 18-Dec-23 5:20:24 pm
61525+
! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.b636cb3f.37 for Win32 console run(s) done: Fri 29-Dec-23 10:23:14 am
6152661526

61527-
! Executable: d:\cse\msvc\cse.exe
61528-
! 18-Dec-23 5:05 pm (VS 14.29 2796032 bytes) (HPWH 1.22.0+HEAD.df305f2.85)
61529-
! Command line: -x! -t1 dhwDU
61530-
! Input file: D:\cse\test\dhwDU.cse
61531-
! Report file: D:\CSE\TEST\DHWDU.REP
61527+
! Executable: c:\users\phil ahrenkiel\documents\github\cse\msvc\cse.exe
61528+
! 29-Dec-23 10:17 am (VS 14.29 2889728 bytes) (HPWH 1.22.0+HEAD.190c546.188)
61529+
! Command line: -x! -b -t1 dhwDU
61530+
! Input file: C:\Users\Phil Ahrenkiel\Documents\GitHub\cse\test\dhwDU.cse
61531+
! Report file: C:\USERS\PHIL AHRENKIEL\DOCUMENTS\GITHUB\CSE\TEST\DHWDU.REP
6153261532

6153361533
! Timing info --
6153461534

61535-
! Input: Time = 0.18 Calls = 3 T/C = 0.0593
61536-
! AutoSizing: Time = 0.32 Calls = 1 T/C = 0.3240
61537-
! Simulation: Time = 6.55 Calls = 2 T/C = 3.2775
61538-
! Reports: Time = 0.09 Calls = 2 T/C = 0.0455
61539-
! Total: Time = 7.15 Calls = 1 T/C = 7.1520
61535+
! Input: Time = 0.30 Calls = 3 T/C = 0.1010
61536+
! AutoSizing: Time = 0.53 Calls = 1 T/C = 0.5310
61537+
! Simulation: Time = 10.49 Calls = 2 T/C = 5.2445
61538+
! Reports: Time = 0.16 Calls = 2 T/C = 0.0805
61539+
! Total: Time = 11.49 Calls = 1 T/C = 11.4870

‎test/ref/DHW_AQUATHERMAIRE.REP‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,26 @@ DHWSYS (kBtu)
6868

6969
Mon qOutDHW qOutHtg qLMisc qLLoop qDWHR qSSF qSolar qPrimWH qLossWH qAuxWH qStorWH qErrWH qPrimLH qLossLH qAuxLH qStorLH qErrWH qXBUDHW qXBUHtg qBal COP
7070
--- ------- ------- ------ ------ ------ ------ ------ ------- ------- ------ ------- ------- ------- ------- ------ ------- ------- ------- ------- ------ --------
71-
Jan 765.086 0 0 0 0 0 0 1005.85 -243.94 0 -0.406 -.00004 0 0 0 0 0 0.955 0 2.635 1.977
72-
Feb 893.895 0 0 0 0 0 0 1106.92 -214.01 0 -4.149 -.00004 0 0 0 0 0 2.760 0 2.371 2.145
73-
Mar 835.582 0 0 0 0 0 0 1048.88 -216.59 0 -0.667 -.00004 0 0 0 0 0 0.880 0 3.077 2.414
74-
Apr 838.404 0 0 0 0 0 0 1047.18 -213.89 0 2.408 -.00004 0 0 0 0 0 0.452 0 2.253 2.376
75-
May 827.603 0 0 0 0 0 0 1032.06 -203.70 0 -2.815 -.00004 0 0 0 0 0 0.106 0 1.958 2.693
76-
Jun 733.233 0 0 0 0 0 0 914.243 -182.07 0 -0.0155 -.00004 0 0 0 0 0 0.00771 0 1.063 3.085
77-
Jul 583.506 0 0 0 0 0 0 767.271 -185.42 0 1.261 -.00003 0 0 0 0 0 0.0116 0 0.380 2.791
78-
Aug 607.153 0 0 0 0 0 0 790.249 -186.07 0 2.399 -.00003 0 0 0 0 0 0.00958 0 0.561 2.844
79-
Sep 608.587 0 0 0 0 0 0 800.494 -190.61 0 -1.956 -.00003 0 0 0 0 0 0.00977 0 0.645 2.637
80-
Oct 629.015 0 0 0 0 0 0 831.237 -207.53 0 4.039 -.00003 0 0 0 0 0 0.0142 0 1.252 2.401
81-
Nov 743.632 0 0 0 0 0 0 962.522 -221.32 0 0.360 -.00004 0 0 0 0 0 0.0505 0 2.020 2.183
82-
Dec 803.454 0 0 0 0 0 0 1043.89 -243.25 0 -0.458 -.00004 0 0 0 0 0 0.649 0 2.627 2.002
71+
Jan 765.086 0 0 0 0 0 0 1005.85 -243.94 0 -0.406 -0.0000 0 0 0 0 0 0.955 0 2.635 1.977
72+
Feb 893.895 0 0 0 0 0 0 1106.92 -214.01 0 -4.149 -0.0000 0 0 0 0 0 2.760 0 2.371 2.145
73+
Mar 835.582 0 0 0 0 0 0 1048.88 -216.59 0 -0.667 -0.0000 0 0 0 0 0 0.880 0 3.077 2.414
74+
Apr 838.404 0 0 0 0 0 0 1047.18 -213.89 0 2.408 -0.0000 0 0 0 0 0 0.452 0 2.253 2.376
75+
May 827.603 0 0 0 0 0 0 1032.06 -203.70 0 -2.815 -0.0000 0 0 0 0 0 0.106 0 1.958 2.693
76+
Jun 733.233 0 0 0 0 0 0 914.243 -182.07 0 -0.0155 -0.0000 0 0 0 0 0 0.00771 0 1.063 3.085
77+
Jul 583.506 0 0 0 0 0 0 767.271 -185.42 0 1.261 -0.0000 0 0 0 0 0 0.0116 0 0.380 2.791
78+
Aug 607.153 0 0 0 0 0 0 790.249 -186.07 0 2.399 -0.0000 0 0 0 0 0 0.00958 0 0.561 2.844
79+
Sep 608.587 0 0 0 0 0 0 800.494 -190.61 0 -1.956 -0.0000 0 0 0 0 0 0.00977 0 0.645 2.637
80+
Oct 629.015 0 0 0 0 0 0 831.237 -207.53 0 4.039 -0.0000 0 0 0 0 0 0.0142 0 1.252 2.401
81+
Nov 743.632 0 0 0 0 0 0 962.522 -221.32 0 0.360 -0.0000 0 0 0 0 0 0.0505 0 2.020 2.183
82+
Dec 803.454 0 0 0 0 0 0 1043.89 -243.25 0 -0.458 -0.0000 0 0 0 0 0 0.649 0 2.627 2.002
8383

84-
Yr 8869.15 0 0 0 0 0 0 11350.8 -2508.4 0 -.00001 -.00044 0 0 0 0 0 5.906 0 20.842 2.394
84+
Yr 8869.15 0 0 0 0 0 0 11350.8 -2508.4 0 -.00001 -0.0000 0 0 0 0 0 5.906 0 20.842 2.394
8585

8686

8787

8888
! Log for Run 001:
8989

90-
! CSE 0.920.0+heat-exchange-models-hpwh.ba14a557.49 for Win32 console
90+
! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.f09863d4.84 for Win32 console
9191

9292

9393

@@ -3724,26 +3724,26 @@ DHWSYS (kBtu)
37243724

37253725
Mon qOutDHW qOutHtg qLMisc qLLoop qDWHR qSSF qSolar qPrimWH qLossWH qAuxWH qStorWH qErrWH qPrimLH qLossLH qAuxLH qStorLH qErrWH qXBUDHW qXBUHtg qBal COP
37263726
--- ------- ------- ------ ------ ------ ------ ------ ------- ------- ------ ------- ------- ------- ------- ------ ------- ------- ------- ------- ------ --------
3727-
Jan 765.086 0 0 0 0 0 0 1030.38 -270.32 0 1.118 -.00004 0 0 0 0 0 0.419 0 3.484 1.692
3728-
Feb 893.895 0 0 0 0 0 0 1126.72 -241.72 0 3.780 -.00004 0 0 0 0 0 0.426 0 4.684 1.845
3729-
Mar 835.582 0 0 0 0 0 0 1081.11 -239.97 0 -9.057 -.00004 0 0 0 0 0 0 0 3.493 2.025
3730-
Apr 838.404 0 0 0 0 0 0 1074.01 -239.33 0 0.457 -.00004 0 0 0 0 0 0 0 3.268 2.064
3731-
May 827.603 0 0 0 0 0 0 1054.77 -229.40 0 -1.060 -.00004 0 0 0 0 0 0 0 3.295 2.337
3732-
Jun 733.233 0 0 0 0 0 0 936.350 -208.85 0 3.504 -.00004 0 0 0 0 0 0 0 2.230 2.634
3733-
Jul 583.506 0 0 0 0 0 0 799.179 -215.30 0 -2.020 -.00003 0 0 0 0 0 0 0 1.646 2.541
3734-
Aug 607.153 0 0 0 0 0 0 814.484 -213.16 0 3.662 -.00003 0 0 0 0 0 0 0 2.166 2.564
3735-
Sep 608.587 0 0 0 0 0 0 827.373 -217.67 0 -3.184 -.00003 0 0 0 0 0 0 0 2.072 2.297
3736-
Oct 629.015 0 0 0 0 0 0 863.435 -235.60 0 -1.589 -.00003 0 0 0 0 0 0 0 2.768 2.036
3737-
Nov 743.632 0 0 0 0 0 0 986.928 -247.49 0 1.204 -.00004 0 0 0 0 0 0 0 2.991 1.872
3738-
Dec 803.454 0 0 0 0 0 0 1068.02 -272.30 0 3.184 -.00004 0 0 0 0 0 0.00523 0 4.539 1.723
3727+
Jan 765.086 0 0 0 0 0 0 1030.38 -270.32 0 1.118 -0.0000 0 0 0 0 0 0.419 0 3.484 1.692
3728+
Feb 893.895 0 0 0 0 0 0 1126.72 -241.72 0 3.780 -0.0000 0 0 0 0 0 0.426 0 4.684 1.845
3729+
Mar 835.582 0 0 0 0 0 0 1081.11 -239.97 0 -9.057 -0.0000 0 0 0 0 0 0 0 3.493 2.025
3730+
Apr 838.404 0 0 0 0 0 0 1074.01 -239.33 0 0.457 -0.0000 0 0 0 0 0 0 0 3.268 2.064
3731+
May 827.603 0 0 0 0 0 0 1054.77 -229.40 0 -1.060 -0.0000 0 0 0 0 0 0 0 3.295 2.337
3732+
Jun 733.233 0 0 0 0 0 0 936.350 -208.85 0 3.504 -0.0000 0 0 0 0 0 0 0 2.230 2.634
3733+
Jul 583.506 0 0 0 0 0 0 799.179 -215.30 0 -2.020 -0.0000 0 0 0 0 0 0 0 1.646 2.541
3734+
Aug 607.153 0 0 0 0 0 0 814.484 -213.16 0 3.662 -0.0000 0 0 0 0 0 0 0 2.166 2.564
3735+
Sep 608.587 0 0 0 0 0 0 827.373 -217.67 0 -3.184 -0.0000 0 0 0 0 0 0 0 2.072 2.297
3736+
Oct 629.015 0 0 0 0 0 0 863.435 -235.60 0 -1.589 -0.0000 0 0 0 0 0 0 0 2.768 2.036
3737+
Nov 743.632 0 0 0 0 0 0 986.928 -247.49 0 1.204 -0.0000 0 0 0 0 0 0 0 2.991 1.872
3738+
Dec 803.454 0 0 0 0 0 0 1068.02 -272.30 0 3.184 -0.0000 0 0 0 0 0 0.00523 0 4.539 1.723
37393739

3740-
Yr 8869.15 0 0 0 0 0 0 11662.8 -2831.1 0 .000052 -.00044 0 0 0 0 0 0.850 0 36.636 2.067
3740+
Yr 8869.15 0 0 0 0 0 0 11662.8 -2831.1 0 .000035 -0.0000 0 0 0 0 0 0.850 0 36.635 2.067
37413741

37423742

37433743

37443744
! Log for Run 002:
37453745

3746-
! CSE 0.920.0+heat-exchange-models-hpwh.ba14a557.49 for Win32 console
3746+
! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.f09863d4.84 for Win32 console
37473747

37483748

37493749

@@ -3762,18 +3762,18 @@ Input for Run 002:
37623762

37633763

37643764

3765-
! CSE 0.920.0+heat-exchange-models-hpwh.ba14a557.49 for Win32 console run(s) done: Thu 04-Jan-24 4:54:28 pm
3765+
! CSE 0.920.0+fix-external-heat-energy-balance-hpwh.f09863d4.84 for Win32 console run(s) done: Wed 10-Jan-24 9:21:34 am
37663766

3767-
! Executable: d:\cse\msvc\cse.exe
3768-
! 04-Jan-24 4:43 pm (VS 14.29 2884608 bytes) (HPWH 1.22.0+change-aquathermaire-coeffs.cdd5a20.199)
3767+
! Executable: c:\users\phil ahrenkiel\documents\github\cse\msvc\cse.exe
3768+
! 10-Jan-24 9:14 am (VS 14.29 2885632 bytes) (HPWH 1.23.0)
37693769
! Command line: -x! -b -t1 dhw_aquathermaire
3770-
! Input file: D:\cse\test\dhw_aquathermaire.cse
3771-
! Report file: D:\CSE\TEST\DHW_AQUATHERMAIRE.REP
3770+
! Input file: C:\Users\Phil Ahrenkiel\Documents\GitHub\cse\test\dhw_aquathermaire.cse
3771+
! Report file: C:\USERS\PHIL AHRENKIEL\DOCUMENTS\GITHUB\CSE\TEST\DHW_AQUATHERMAIRE.REP
37723772

37733773
! Timing info --
37743774

3775-
! Input: Time = 0.22 Calls = 2 T/C = 0.1085
3775+
! Input: Time = 0.33 Calls = 2 T/C = 0.1645
37763776
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
3777-
! Simulation: Time = 9.09 Calls = 2 T/C = 4.5435
3778-
! Reports: Time = 0.00 Calls = 2 T/C = 0.0015
3779-
! Total: Time = 9.31 Calls = 1 T/C = 9.3090
3777+
! Simulation: Time = 13.46 Calls = 2 T/C = 6.7320
3778+
! Reports: Time = 0.02 Calls = 2 T/C = 0.0120
3779+
! Total: Time = 13.83 Calls = 1 T/C = 13.8330

0 commit comments

Comments
 (0)