Merge pull request #7145 from mcgratta/master

FDS Validation: Minor change to MPI scaling tests scripts
firemodels · Feb 4, 2019 · 14cc738 · 14cc738
2 parents fadd2c0 + 0860189
commit 14cc738
Show file tree

Hide file tree

Showing 35 changed files with 4 additions and 44 deletions.
diff --git a/Utilities/Matlab/scripts/scaling_tests.m b/Utilities/Matlab/scripts/scaling_tests.m
@@ -23,9 +23,9 @@
 r = [1 8 32 64 96 192 288 432];
 r2 = [.1 8 32 64 96 192 432 1000];
 
-for j=1:15
+for j=1:16
    for i=1:8
-      t(i,j) = M(i).data(1,j)/M(1).data(1,15);
+      t(i,j) = M(i).data(1,j)/M(1).data(1,16);
       t2(i) = 1./r2(i);
    end
 end
@@ -45,7 +45,7 @@
 H1(9) = loglog(r2,t2/128,'k:'); hold on
 H1(10) = loglog(r2,t2/256,'k:'); hold on
 
-H(1) = loglog(r,t(:,15),'k-o');
+H(1) = loglog(r,t(:,16),'k-o');
 H(2) = loglog(r,t(:,3),'r-o');
 H(3) = loglog(r,t(:,4),'b-o');
 H(4) = loglog(r,t(:,5),'m-o');
@@ -105,7 +105,7 @@
 r = [1 2 4 8 16 32 64 128 192 288 432];
 
 for i=1:11
-   t(i) = M(1).data(1,15)/M(i).data(1,15);
+   t(i) = M(1).data(1,16)/M(i).data(1,16);
    t2(i) = 1.;
 end
 

diff --git a/..._Input_Files/strong_scaling_glmat_001.fds → ..._Files_glmat/strong_scaling_glmat_001.fds b/..._Input_Files/strong_scaling_glmat_001.fds → ..._Files_glmat/strong_scaling_glmat_001.fds
diff --git a/..._Input_Files/strong_scaling_glmat_008.fds → ..._Files_glmat/strong_scaling_glmat_008.fds b/..._Input_Files/strong_scaling_glmat_008.fds → ..._Files_glmat/strong_scaling_glmat_008.fds
diff --git a/..._Input_Files/strong_scaling_glmat_032.fds → ..._Files_glmat/strong_scaling_glmat_032.fds b/..._Input_Files/strong_scaling_glmat_032.fds → ..._Files_glmat/strong_scaling_glmat_032.fds
diff --git a/..._Input_Files/strong_scaling_glmat_064.fds → ..._Files_glmat/strong_scaling_glmat_064.fds b/..._Input_Files/strong_scaling_glmat_064.fds → ..._Files_glmat/strong_scaling_glmat_064.fds
diff --git a/..._Input_Files/strong_scaling_glmat_096.fds → ..._Files_glmat/strong_scaling_glmat_096.fds b/..._Input_Files/strong_scaling_glmat_096.fds → ..._Files_glmat/strong_scaling_glmat_096.fds
diff --git a/..._Input_Files/strong_scaling_glmat_192.fds → ..._Files_glmat/strong_scaling_glmat_192.fds b/..._Input_Files/strong_scaling_glmat_192.fds → ..._Files_glmat/strong_scaling_glmat_192.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_001.fds → ...ut_Files_glmat/weak_scaling_glmat_001.fds b/...DS_Input_Files/weak_scaling_glmat_001.fds → ...ut_Files_glmat/weak_scaling_glmat_001.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_002.fds → ...ut_Files_glmat/weak_scaling_glmat_002.fds b/...DS_Input_Files/weak_scaling_glmat_002.fds → ...ut_Files_glmat/weak_scaling_glmat_002.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_004.fds → ...ut_Files_glmat/weak_scaling_glmat_004.fds b/...DS_Input_Files/weak_scaling_glmat_004.fds → ...ut_Files_glmat/weak_scaling_glmat_004.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_008.fds → ...ut_Files_glmat/weak_scaling_glmat_008.fds b/...DS_Input_Files/weak_scaling_glmat_008.fds → ...ut_Files_glmat/weak_scaling_glmat_008.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_016.fds → ...ut_Files_glmat/weak_scaling_glmat_016.fds b/...DS_Input_Files/weak_scaling_glmat_016.fds → ...ut_Files_glmat/weak_scaling_glmat_016.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_032.fds → ...ut_Files_glmat/weak_scaling_glmat_032.fds b/...DS_Input_Files/weak_scaling_glmat_032.fds → ...ut_Files_glmat/weak_scaling_glmat_032.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_064.fds → ...ut_Files_glmat/weak_scaling_glmat_064.fds b/...DS_Input_Files/weak_scaling_glmat_064.fds → ...ut_Files_glmat/weak_scaling_glmat_064.fds
diff --git a/...DS_Input_Files/weak_scaling_glmat_128.fds → ...ut_Files_glmat/weak_scaling_glmat_128.fds b/...DS_Input_Files/weak_scaling_glmat_128.fds → ...ut_Files_glmat/weak_scaling_glmat_128.fds
diff --git a/..._Input_Files/strong_scaling_scarc_001.fds → ..._Files_scarc/strong_scaling_scarc_001.fds b/..._Input_Files/strong_scaling_scarc_001.fds → ..._Files_scarc/strong_scaling_scarc_001.fds
diff --git a/..._Input_Files/strong_scaling_scarc_008.fds → ..._Files_scarc/strong_scaling_scarc_008.fds b/..._Input_Files/strong_scaling_scarc_008.fds → ..._Files_scarc/strong_scaling_scarc_008.fds
diff --git a/..._Input_Files/strong_scaling_scarc_032.fds → ..._Files_scarc/strong_scaling_scarc_032.fds b/..._Input_Files/strong_scaling_scarc_032.fds → ..._Files_scarc/strong_scaling_scarc_032.fds
diff --git a/..._Input_Files/strong_scaling_scarc_064.fds → ..._Files_scarc/strong_scaling_scarc_064.fds b/..._Input_Files/strong_scaling_scarc_064.fds → ..._Files_scarc/strong_scaling_scarc_064.fds
diff --git a/..._Input_Files/strong_scaling_scarc_096.fds → ..._Files_scarc/strong_scaling_scarc_096.fds b/..._Input_Files/strong_scaling_scarc_096.fds → ..._Files_scarc/strong_scaling_scarc_096.fds
diff --git a/..._Input_Files/strong_scaling_scarc_192.fds → ..._Files_scarc/strong_scaling_scarc_192.fds b/..._Input_Files/strong_scaling_scarc_192.fds → ..._Files_scarc/strong_scaling_scarc_192.fds
diff --git a/..._Input_Files/strong_scaling_scarc_288.fds → ..._Files_scarc/strong_scaling_scarc_288.fds b/..._Input_Files/strong_scaling_scarc_288.fds → ..._Files_scarc/strong_scaling_scarc_288.fds
diff --git a/..._Input_Files/strong_scaling_scarc_432.fds → ..._Files_scarc/strong_scaling_scarc_432.fds b/..._Input_Files/strong_scaling_scarc_432.fds → ..._Files_scarc/strong_scaling_scarc_432.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_001.fds → ...ut_Files_scarc/weak_scaling_scarc_001.fds b/...DS_Input_Files/weak_scaling_scarc_001.fds → ...ut_Files_scarc/weak_scaling_scarc_001.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_002.fds → ...ut_Files_scarc/weak_scaling_scarc_002.fds b/...DS_Input_Files/weak_scaling_scarc_002.fds → ...ut_Files_scarc/weak_scaling_scarc_002.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_004.fds → ...ut_Files_scarc/weak_scaling_scarc_004.fds b/...DS_Input_Files/weak_scaling_scarc_004.fds → ...ut_Files_scarc/weak_scaling_scarc_004.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_008.fds → ...ut_Files_scarc/weak_scaling_scarc_008.fds b/...DS_Input_Files/weak_scaling_scarc_008.fds → ...ut_Files_scarc/weak_scaling_scarc_008.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_016.fds → ...ut_Files_scarc/weak_scaling_scarc_016.fds b/...DS_Input_Files/weak_scaling_scarc_016.fds → ...ut_Files_scarc/weak_scaling_scarc_016.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_032.fds → ...ut_Files_scarc/weak_scaling_scarc_032.fds b/...DS_Input_Files/weak_scaling_scarc_032.fds → ...ut_Files_scarc/weak_scaling_scarc_032.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_064.fds → ...ut_Files_scarc/weak_scaling_scarc_064.fds b/...DS_Input_Files/weak_scaling_scarc_064.fds → ...ut_Files_scarc/weak_scaling_scarc_064.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_128.fds → ...ut_Files_scarc/weak_scaling_scarc_128.fds b/...DS_Input_Files/weak_scaling_scarc_128.fds → ...ut_Files_scarc/weak_scaling_scarc_128.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_192.fds → ...ut_Files_scarc/weak_scaling_scarc_192.fds b/...DS_Input_Files/weak_scaling_scarc_192.fds → ...ut_Files_scarc/weak_scaling_scarc_192.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_288.fds → ...ut_Files_scarc/weak_scaling_scarc_288.fds b/...DS_Input_Files/weak_scaling_scarc_288.fds → ...ut_Files_scarc/weak_scaling_scarc_288.fds
diff --git a/...DS_Input_Files/weak_scaling_scarc_432.fds → ...ut_Files_scarc/weak_scaling_scarc_432.fds b/...DS_Input_Files/weak_scaling_scarc_432.fds → ...ut_Files_scarc/weak_scaling_scarc_432.fds
diff --git a/Validation/MPI_Scaling_Tests/Run_All.sh b/Validation/MPI_Scaling_Tests/Run_All.sh
@@ -30,43 +30,3 @@ $QFDS $DEBUG $QUEUE -p 32  -n $nprocs -d $INDIR strong_scaling_test_032.fds
 $QFDS $DEBUG $QUEUE -p 8   -n $nprocs -d $INDIR strong_scaling_test_008.fds
 $QFDS $DEBUG $QUEUE -p 1   -n $nprocs -d $INDIR strong_scaling_test_001.fds
 
-# run GLMAT pressure solver cases
-
-$QFDS $DEBUG $QUEUE -p 128 -n $nprocs -d $INDIR weak_scaling_glmat_128.fds
-$QFDS $DEBUG $QUEUE -p 64  -n $nprocs -d $INDIR weak_scaling_glmat_064.fds
-$QFDS $DEBUG $QUEUE -p 32  -n $nprocs -d $INDIR weak_scaling_glmat_032.fds
-$QFDS $DEBUG $QUEUE -p 16  -n $nprocs -d $INDIR weak_scaling_glmat_016.fds
-$QFDS $DEBUG $QUEUE -p 8   -n $nprocs -d $INDIR weak_scaling_glmat_008.fds
-$QFDS $DEBUG $QUEUE -p 4   -n $nprocs -d $INDIR weak_scaling_glmat_004.fds
-$QFDS $DEBUG $QUEUE -p 2   -n $nprocs -d $INDIR weak_scaling_glmat_002.fds
-$QFDS $DEBUG $QUEUE -p 1   -n $nprocs -d $INDIR weak_scaling_glmat_001.fds
-
-$QFDS $DEBUG $QUEUE -p 192 -n $nprocs -d $INDIR strong_scaling_glmat_192.fds
-$QFDS $DEBUG $QUEUE -p 96  -n $nprocs -d $INDIR strong_scaling_glmat_096.fds
-$QFDS $DEBUG $QUEUE -p 64  -n $nprocs -d $INDIR strong_scaling_glmat_064.fds
-$QFDS $DEBUG $QUEUE -p 32  -n $nprocs -d $INDIR strong_scaling_glmat_032.fds
-$QFDS $DEBUG $QUEUE -p 8   -n $nprocs -d $INDIR strong_scaling_glmat_008.fds
-$QFDS $DEBUG $QUEUE -p 1   -n $nprocs -d $INDIR strong_scaling_glmat_001.fds
-
-# run ScaRC pressure solver cases
-
-$QFDS $DEBUG $QUEUE -p 432 -n $nprocs -d $INDIR weak_scaling_scarc_432.fds
-$QFDS $DEBUG $QUEUE -p 288 -n $nprocs -d $INDIR weak_scaling_scarc_288.fds
-$QFDS $DEBUG $QUEUE -p 192 -n $nprocs -d $INDIR weak_scaling_scarc_192.fds
-$QFDS $DEBUG $QUEUE -p 128 -n $nprocs -d $INDIR weak_scaling_scarc_128.fds
-$QFDS $DEBUG $QUEUE -p 64  -n $nprocs -d $INDIR weak_scaling_scarc_064.fds
-$QFDS $DEBUG $QUEUE -p 32  -n $nprocs -d $INDIR weak_scaling_scarc_032.fds
-$QFDS $DEBUG $QUEUE -p 16  -n $nprocs -d $INDIR weak_scaling_scarc_016.fds
-$QFDS $DEBUG $QUEUE -p 8   -n $nprocs -d $INDIR weak_scaling_scarc_008.fds
-$QFDS $DEBUG $QUEUE -p 4   -n $nprocs -d $INDIR weak_scaling_scarc_004.fds
-$QFDS $DEBUG $QUEUE -p 2   -n $nprocs -d $INDIR weak_scaling_scarc_002.fds
-$QFDS $DEBUG $QUEUE -p 1   -n $nprocs -d $INDIR weak_scaling_scarc_001.fds
-
-$QFDS $DEBUG $QUEUE -p 432 -n $nprocs -d $INDIR strong_scaling_scarc_432.fds
-$QFDS $DEBUG $QUEUE -p 288 -n $nprocs -d $INDIR strong_scaling_scarc_288.fds
-$QFDS $DEBUG $QUEUE -p 192 -n $nprocs -d $INDIR strong_scaling_scarc_192.fds
-$QFDS $DEBUG $QUEUE -p 96  -n $nprocs -d $INDIR strong_scaling_scarc_096.fds
-$QFDS $DEBUG $QUEUE -p 64  -n $nprocs -d $INDIR strong_scaling_scarc_064.fds
-$QFDS $DEBUG $QUEUE -p 32  -n $nprocs -d $INDIR strong_scaling_scarc_032.fds
-$QFDS $DEBUG $QUEUE -p 8   -n $nprocs -d $INDIR strong_scaling_scarc_008.fds
-$QFDS $DEBUG $QUEUE -p 1   -n $nprocs -d $INDIR strong_scaling_scarc_001.fds