Skip to content

Commit c599398

Browse files
michael-okeefemichael-okeefe
committed
Rename test files to be consistent; update names in other files; update references for tests
In particular, had to remove the ".cse" from the tx.bat file in order for the tx.bat to run the test correctly. Added REP file for new test for pv_bt_test.cse. Changed name from pv-bt-test.cse to pv_bt_test.cse (i.e., "-" to "_"); similarly changed the corresponding *.dat file.
1 parent 4c5eb6e commit c599398

32 files changed

+3949
-3633
lines changed

‎test/pv-bt-data.dat‎ renamed to ‎test/pv_bt_data.dat‎

File renamed without changes.

‎test/pv-bt-test.cse‎ renamed to ‎test/pv_bt_test.cse‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Specifically, above, if TDV is 1/2 of TDV_ref, then only 1/4 of the load is requ
3838
NOTE: if CSE is built with the _DEBUG symbol defined, then you will get a warning when the gnPower of BuildingLoad goes negative. The GAIN object is not typically used in the fashion we present here: we merely want to specify the "effective" building load + PV without clutting this file with an entire building definition (as you would do in a real study).
3939
*/
4040
IMPORTFILE Data
41-
imFileName="pv-bt-data.dat"
41+
imFileName="pv_bt_data.dat"
4242
imFreq="Hour"
4343
imTitle="PV/BT Data"
4444

‎test/ref/1ZATTIC.REP‎

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

‎test/ref/2ZATTIC.REP‎

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

‎test/ref/2ZONE.REP‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Yr 68.74 53.05 0 0 0 4.782 -17.12 0 12.335 0 0 0
6060

6161

6262
------------------------------------------------------------------------------
63-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 1
63+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 1
6464

6565

6666

@@ -123,7 +123,7 @@ IzXfer Zn1: Z1 Zn2: Z2 UAconst: 5.000 NVctrl: TwoWay
123123

124124

125125
------------------------------------------------------------------------------
126-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 2
126+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 2
127127

128128

129129

@@ -186,7 +186,7 @@ Annual Heating Energy Report
186186

187187

188188
------------------------------------------------------------------------------
189-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 3
189+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 3
190190

191191

192192

@@ -249,7 +249,7 @@ Yr 4.782 0 0 0 0 0 0 0 0 0 0
249249

250250

251251
------------------------------------------------------------------------------
252-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 4
252+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 4
253253

254254

255255

@@ -312,7 +312,7 @@ Day 53.46 49.45 0 0 0 .0066 -.0831 0.0765 0 0 0 0
312312

313313

314314
------------------------------------------------------------------------------
315-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 5
315+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 5
316316

317317

318318

@@ -375,7 +375,7 @@ Day -3.4 -4.8 68.0 43.1 0 68.0 43.1 68.0 43.1 24.00 1.0 1003 0 0
375375

376376

377377
------------------------------------------------------------------------------
378-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 6
378+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 6
379379

380380

381381

@@ -438,7 +438,7 @@ Day 82.53 61.05 0 0 0 .0066 .00456 -.0111 0 0 0 0
438438

439439

440440
------------------------------------------------------------------------------
441-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 7
441+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 7
442442

443443

444444

@@ -501,7 +501,7 @@ Day 80.7 55.6 78.8 54.9 0 78.8 54.9 77.6 54.4 24.00 1.0 1003 0 .0308
501501

502502

503503
------------------------------------------------------------------------------
504-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 8
504+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 8
505505

506506

507507

@@ -564,7 +564,7 @@ Day 69.02 56.01 0 0 0 .0066 -.0114 .00489 0 0 0 0
564564

565565

566566
------------------------------------------------------------------------------
567-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 9
567+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 9
568568

569569

570570

@@ -627,7 +627,7 @@ Day 58.9 42.9 70.8 48.6 0 70.8 48.6 70.8 48.6 24.00 1.0 1003 0 0
627627

628628

629629
------------------------------------------------------------------------------
630-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 10
630+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 10
631631

632632

633633

@@ -690,7 +690,7 @@ Input for Run 001:
690690
nSubSteps=4 //
691691

692692
------------------------------------------------------------------------------
693-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 11
693+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 11
694694

695695

696696

@@ -753,7 +753,7 @@ Z2
753753
CONSTRUCTION roofcon
754754

755755
------------------------------------------------------------------------------
756-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 12
756+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 12
757757

758758

759759

@@ -816,7 +816,7 @@ Z2
816816
//--------- AIR HANDLERS ------------
817817

818818
------------------------------------------------------------------------------
819-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 13
819+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 13
820820

821821

822822

@@ -879,7 +879,7 @@ Z2
879879
0 ahROLeak=0 //No return duct leaks
880880

881881
------------------------------------------------------------------------------
882-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 14
882+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 14
883883

884884

885885

@@ -942,7 +942,7 @@ Z2
942942
//=========
943943

944944
------------------------------------------------------------------------------
945-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 15
945+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 15
946946

947947

948948

@@ -1005,7 +1005,7 @@ Z2
10051005
sfArea=450
10061006

10071007
------------------------------------------------------------------------------
1008-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 16
1008+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 16
10091009

10101010

10111011

@@ -1068,7 +1068,7 @@ Z2
10681068
0 sgSide=INTERIOR
10691069

10701070
------------------------------------------------------------------------------
1071-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 17
1071+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 17
10721072

10731073

10741074

@@ -1131,7 +1131,7 @@ Z2
11311131

11321132

11331133
------------------------------------------------------------------------------
1134-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 18
1134+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 18
11351135

11361136

11371137

@@ -1194,7 +1194,7 @@ Z2
11941194
0 ohExL=0 //distance:left edge of win to left edge of oh
11951195

11961196
------------------------------------------------------------------------------
1197-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 19
1197+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 19
11981198

11991199

12001200

@@ -1257,7 +1257,7 @@ Z2
12571257
# #endif
12581258

12591259
------------------------------------------------------------------------------
1260-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 20
1260+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 20
12611261

12621262

12631263

@@ -1320,7 +1320,7 @@ Z2
13201320
REPORT rpType=MTR rpMeter=COOLMETER rpFreq=Month
13211321

13221322
------------------------------------------------------------------------------
1323-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 21
1323+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 21
13241324

13251325

13261326

@@ -1383,7 +1383,7 @@ Z2
13831383
0 exportcol colVal=@meter[COOLMETER].Y.dmd/-3413 //kwh
13841384

13851385
------------------------------------------------------------------------------
1386-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 22
1386+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 22
13871387

13881388

13891389

@@ -1446,7 +1446,7 @@ Z2
14461446
0 exType=ZEB
14471447

14481448
------------------------------------------------------------------------------
1449-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 23
1449+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 23
14501450

14511451

14521452

@@ -1509,7 +1509,7 @@ Z2
15091509
0 exZone=CASE
15101510

15111511
------------------------------------------------------------------------------
1512-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 24
1512+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 24
15131513

15141514

15151515

@@ -1572,7 +1572,7 @@ Z2
15721572

15731573

15741574
------------------------------------------------------------------------------
1575-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 25
1575+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 25
15761576

15771577

15781578

@@ -1581,20 +1581,20 @@ Z2
15811581

15821582

15831583

1584-
! CSE 0.818 for Win32 console run(s) done: Mon 16-Jan-17 4:52:00 pm
1585-
! Executable: c:\projects\cse\run\csed.exe
1586-
! 16-Jan-17 4:19 pm (VS 14.0 2959872 bytes) (HPWH 1.3.0)
1584+
! CSE 0.818 for Win32 console run(s) done: Tue 17-Jan-17 11:33:41 am
1585+
! Executable: c:\projects\cse\run\cse.exe
1586+
! 16-Jan-17 4:17 pm (VS 14.0 1291264 bytes) (HPWH 1.3.0)
15871587

15881588
! Input file name: C:\Projects\cse\test\2Zone.cse
15891589
! Report file name: C:\Projects\cse\test\2Zone.rep
15901590

15911591
! Timing info --
15921592

1593-
! Input: Time = 0.08 Calls = 1 T/C = 0.0780
1593+
! Input: Time = 0.01 Calls = 1 T/C = 0.0080
15941594
! AutoSizing: Time = 0.00 Calls = 0 T/C = 0.0000
1595-
! Simulation: Time = 3.30 Calls = 1 T/C = 3.3000
1596-
! Reports: Time = 0.10 Calls = 1 T/C = 0.0990
1597-
! Total: Time = 3.57 Calls = 1 T/C = 3.5690
1595+
! Simulation: Time = 0.53 Calls = 1 T/C = 0.5260
1596+
! Reports: Time = 0.02 Calls = 1 T/C = 0.0220
1597+
! Total: Time = 0.56 Calls = 1 T/C = 0.5630
15981598

15991599

16001600

@@ -1635,5 +1635,5 @@ Z2
16351635

16361636

16371637
------------------------------------------------------------------------------
1638-
! 2Zone 001 Mon 16-Jan-17 4:51:57 pm Page 26
1638+
! 2Zone 001 Tue 17-Jan-17 11:33:41 am Page 26
16391639

0 commit comments

Comments
 (0)