Skip to content

Commit bc9da78

Browse files
rmcdermormcdermo
authored
Merge pull request firemodels#12570 from rmcdermo/master
FDS Validation: add OMP_Scaling_Tests to validation suite
2 parents 3330851 + e10d7a5 commit bc9da78

21 files changed

+486
-1
lines changed

‎Utilities/Matlab/scripts/openmp_timing_benchmarks.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
plot_style
99

10-
dir = '../../Verification/Timing_Benchmarks/';
10+
% dir = '../../Verification/Timing_Benchmarks/';
11+
dir = '../../../out/OMP_Scaling_Tests/';
1112

1213
ncores = [1,2,3,4,5,6,7,8];
1314
a = {'a','b','c','d','e','f','g','h'};

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128a.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128a', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128b.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128b', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128c.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128c', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128d.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128d', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128e.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128e', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128f.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128f', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128g.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128g', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test128h.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test128h', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=128,128,128, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=1.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

‎Validation/OMP_Scaling_Tests/FDS_Input_Files/openmp_test64a.fds

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
&HEAD CHID='openmp_test64a', TITLE='General purpose input file to test FDS timings' /
2+
3+
REM DO NOT EDIT the .fds input files directly. When making changes:
4+
REM 1. edit the template file, makecase.sh
5+
REM 2. rerun the script makecases.sh
6+
REM 3. commit updated openmp_test64...fds and openmp_test128...fds input files
7+
8+
&MESH IJK=64,64,64, XB=0.0,1.0,0.0,1.0,0.0,1.0 /
9+
10+
&TIME T_END=10.0 /
11+
12+
&DUMP NFRAMES=2,DT_DEVC=0.1 /
13+
14+
&SPEC ID='METHANE' /
15+
&SPEC ID='WATER VAPOR' /
16+
17+
&SURF ID='HOT', VEL=-0.1, TMP_FRONT=100., COLOR='RED' /
18+
19+
&VENT MB='XMIN', SURF_ID='OPEN' /
20+
&VENT MB='XMAX', SURF_ID='OPEN' /
21+
&VENT MB='YMIN', SURF_ID='OPEN' /
22+
&VENT MB='YMAX', SURF_ID='OPEN' /
23+
&VENT PBZ=0.0, SURF_ID='HOT' /
24+
&VENT MB='ZMAX', SURF_ID='OPEN' /
25+
26+
&DEVC XYZ=0.5,0.5,0.5, QUANTITY='WALL CLOCK TIME ITERATIONS', ID='clock time' /
27+
28+
&TAIL /

0 commit comments

Comments
 (0)