Minor improvements in performance and code clarity.

Still no solution for the reset subroutine. It is really time
consumming.
This commit is contained in:
Jorge Gonzalez 2020-10-13 18:16:18 +02:00
commit ffb03e634b
12 changed files with 233 additions and 117 deletions

View file

@ -1,5 +1,5 @@
set terminal qt enhanced 1 size 1600, 1000 font "Times ,10"
set terminal qt enhanced 1 persist size 1600, 1000 font "Times ,10"
set style line 1 pt 4 lc rgb "#B50427" #Squares red
set style line 2 pt 6 lc rgb "#3B4CC1" #Circles blue
@ -8,47 +8,109 @@ set style line 4 pt 2 lc rgb "#FE7F0E" #Exes orange
set style line 5 pt 8 lc rgb "#D6696B" #Triangles light red
set style line 10 lt 1 lw 2.0 lc rgb "black" #Black solid line
folder1 = "2020-09-27_10.46.31/"
folder2 = "2020-09-28_10.49.22/"
folder3 = "2020-09-30_20.40.04/"
folder4 = "2020-10-01_08.53.50/"
folder1 = "base_case/"
name1 = "Base Case"
folder2 = "2020-10-11_17.58.30/"
name2 = "New Version"
folder3 = "2020-10-13_17.53.32/"
name3 = "Sections"
folder4 = "2020-10-11_15.20.09/"
name4 = "New list"
set key box opaque
set pointsize 1.5
set ylabel "Time per particle (ms)"
set xrange [0:8000]
set xrange [0:500]
set xlabel "Iteration"
set multiplot layout 2,3
set title "Total"
plot folder1."cpuTime.dat" u 1:(1e3*$3) t "Step 1" ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$3) t "Step 2" ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$3) t "Step 3" ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$3) t "Step 4" ls 4
plot folder1."cpuTime.dat" u 1:(1e3*$3) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$3) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$3) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$3) t name4 ls 4
set title "Push"
plot folder1."cpuTime.dat" u 1:(1e3*$4) t "Step 1" ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$4) t "Step 2" ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$4) t "Step 3" ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$4) t "Step 4" ls 4
plot folder1."cpuTime.dat" u 1:(1e3*$4) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$4) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$4) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$4) t name4 ls 4
set title "Reset"
plot folder1."cpuTime.dat" u 1:(1e3*$5) t "Step 1" ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$5) t "Step 2" ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$5) t "Step 3" ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$5) t "Step 4" ls 4
plot folder1."cpuTime.dat" u 1:(1e3*$5) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$5) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$5) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$5) t name4 ls 4
set title "Collisions"
plot folder1."cpuTime.dat" u 1:(1e3*$6) t "Step 1" ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$6) t "Step 2" ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$6) t "Step 3" ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$6) t "Step 4" ls 4
plot folder1."cpuTime.dat" u 1:(1e3*$6) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$6) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$6) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$6) t name4 ls 4
set title "Weighting"
plot folder1."cpuTime.dat" u 1:(1e3*$7) t "Step 1" ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$7) t "Step 2" ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$7) t "Step 3" ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$7) t "Step 4" ls 4
plot folder1."cpuTime.dat" u 1:(1e3*$7) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e3*$7) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e3*$7) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e3*$7) t name4 ls 4
set title "Num. particles"
plot folder1."cpuTime.dat" u 1:($2) t name1 ls 1, \
folder2."cpuTime.dat" u 1:($2) t name2 ls 2, \
folder3."cpuTime.dat" u 1:($2) t name3 ls 3, \
folder4."cpuTime.dat" u 1:($2) t name4 ls 4
unset multiplot
set terminal qt enhanced 2 persist size 1600, 1000 font "Times ,10"
set style line 1 pt 4 lc rgb "#B50427" #Squares red
set style line 2 pt 6 lc rgb "#3B4CC1" #Circles blue
set style line 3 pt 1 lc rgb "#2CA02C" #Crosses green
set style line 4 pt 2 lc rgb "#FE7F0E" #Exes orange
set style line 5 pt 8 lc rgb "#D6696B" #Triangles light red
set style line 10 lt 1 lw 2.0 lc rgb "black" #Black solid line
set key box opaque
set pointsize 1.5
set ylabel "Time per particle (micros)"
set xrange [0:500]
set xlabel "Iteration"
set multiplot layout 2,3
set title "Total"
plot folder1."cpuTime.dat" u 1:(1e6*$3/$2) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e6*$3/$2) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e6*$3/$2) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e6*$3/$2) t name4 ls 4
set title "Push"
plot folder1."cpuTime.dat" u 1:(1e6*$4/$2) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e6*$4/$2) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e6*$4/$2) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e6*$4/$2) t name4 ls 4
set title "Reset"
plot folder1."cpuTime.dat" u 1:(1e6*$5/$2) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e6*$5/$2) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e6*$5/$2) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e6*$5/$2) t name4 ls 4
set title "Collisions"
plot folder1."cpuTime.dat" u 1:(1e6*$6/$2) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e6*$6/$2) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e6*$6/$2) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e6*$6/$2) t name4 ls 4
set title "Weighting"
plot folder1."cpuTime.dat" u 1:(1e6*$7/$2) t name1 ls 1, \
folder2."cpuTime.dat" u 1:(1e6*$7/$2) t name2 ls 2, \
folder3."cpuTime.dat" u 1:(1e6*$7/$2) t name3 ls 3, \
folder4."cpuTime.dat" u 1:(1e6*$7/$2) t name4 ls 4
unset multiplot

View file

@ -1,5 +1,5 @@
reset
set terminal qt enhanced 1 size 1800, 400 font "Times ,10"
set terminal qt enhanced 1 persist size 1800, 400 font "Times ,10"
set style line 1 pt 4 lc rgb "#B50427" #Squares red
set style line 2 pt 6 lc rgb "#3B4CC1" #Circles blue
@ -46,4 +46,4 @@ set xlabel "Iteration"
plot "cpuTime.dat" u 1:(1e6*$4/$2) t "Push" ls 1, \
"" u 1:(1e6*$5/$2) t "Reset" ls 2, \
"" u 1:(1e6*$6/$2) t "Collisions" ls 3, \
"" u 1:(1e6*$7/$2) t "Weighting" ls 4
"" u 1:(1e6*$7/$2) t "Weighting" ls 4