mm

Merge branch 'master' of ssh://bilbo.iut-bm.univ-fcomte.fr/GMRES2stage

diff --git a/nb_iter_sec_ex15_juqueen.plot b/nb_iter_sec_ex15_juqueen.plot
index 72524e94c574fe33bd5f6e792bb1859b025f7e5a..b80c7da3bb8128fa77e564835468b577349eecd1 100755 (executable)
--- a/nb_iter_sec_ex15_juqueen.plot
+++ b/nb_iter_sec_ex15_juqueen.plot
@@ -8,10 +8,10 @@ set ylabel "nb. iter. per second"
 set xlabel "nb. of cores" 
 set key on outside left bmargin
 plot 'nb_iter_sec_ex15_juqueen.txt' using 1:2 t "GMRES/mg"      with linespoints lt 1 lw 2 ps 0 pt 5,\
-  'nb_iter_sec_ex15_juqueen.txt' using 1:3 t "TSARM CGLS/mg"    with linespoints lt 2 lw 2 ps 0 pt 1,\
-  'nb_iter_sec_ex15_juqueen.txt' using 1:4 t "TSARM LSQR/mg"    with linespoints lt 3 lw 2 ps 0 pt 1,\
+  'nb_iter_sec_ex15_juqueen.txt' using 1:3 t "TSIRM CGLS/mg"    with linespoints lt 2 lw 2 ps 0 pt 1,\
+  'nb_iter_sec_ex15_juqueen.txt' using 1:4 t "TSIRM LSQR/mg"    with linespoints lt 3 lw 2 ps 0 pt 1,\
 'nb_iter_sec_ex15_juqueen.txt' using 1:5 t "GMRES/sor"      with linespoints lt 4 lw 2 ps 0 pt 1,\
-  'nb_iter_sec_ex15_juqueen.txt' using 1:6 t "TSARM CGLS/sor"    with linespoints lt 5 lw 2 ps 0 pt 1,\
-  'nb_iter_sec_ex15_juqueen.txt' using 1:7 t "TSARM LSQR/sor"    with linespoints lt 6 lw 2 ps 0 pt 1
+  'nb_iter_sec_ex15_juqueen.txt' using 1:6 t "TSIRM CGLS/sor"    with linespoints lt 5 lw 2 ps 0 pt 1,\
+  'nb_iter_sec_ex15_juqueen.txt' using 1:7 t "TSIRM LSQR/sor"    with linespoints lt 6 lw 2 ps 0 pt 1
 
 

diff --git a/nb_iter_sec_ex54_curie.pdf b/nb_iter_sec_ex54_curie.pdf
new file mode 100644 (file)
index 0000000..5d6f1dd
Binary files /dev/null and b/nb_iter_sec_ex54_curie.pdf differ

diff --git a/nb_iter_sec_ex54_curie.plot b/nb_iter_sec_ex54_curie.plot
new file mode 100644 (file)
index 0000000..ee5fab6
--- /dev/null
+++ b/nb_iter_sec_ex54_curie.plot
@@ -0,0 +1,17 @@
+# Analysis description 
+set encoding iso_8859_1
+set terminal x11
+set size 1,0.5
+#set log x
+#set log y
+set term postscript enhanced portrait "Helvetica" 12
+
+set ylabel "nb. iter. per second" 
+set xlabel "nb. of cores" 
+set key on outside left bmargin
+plot 'nb_iter_sec_ex54_curie.txt' using 1:2 t "GMRES/mg"      with linespoints lt 1 lw 2 ps 0 pt 5,\
+  'nb_iter_sec_ex54_curie.txt' using 1:3 t "TSIRM CGLS/mg"    with linespoints lt 2 lw 2 ps 0 pt 1,\
+  'nb_iter_sec_ex54_curie.txt' using 1:4 t "TSIRM LSQR/mg"    with linespoints lt 3 lw 2 ps 0 pt 1
+
+
+

diff --git a/nb_iter_sec_ex54_curie.txt b/nb_iter_sec_ex54_curie.txt
new file mode 100644 (file)
index 0000000..70a51dc
--- /dev/null
+++ b/nb_iter_sec_ex54_curie.txt
@@ -0,0 +1,7 @@
+#       mg gm      mg cgls    mg lsqr  
+ 512    8.34                    8.15                           8.14
+ 1024          16.90                    16.60                  16.47
+ 2048          34.22                    33.84                  33.51
+ 4096          69.97                    67.96                  70.97
+ 8192          139.59           137.63                 130.07
+

diff --git a/paper.tex b/paper.tex
index 808560489bfb808dc5e5e33cdcd5de830990b24d..e3d19ec0d604e10229be70a5643a4b4c08aeb92b 100644 (file)
--- a/paper.tex
+++ b/paper.tex
@@ -897,7 +897,7 @@ corresponds to 30*12, there are $max\_iter_{ls}$ which corresponds to 15.
 \begin{figure}[htbp]
 \centering
   \includegraphics[width=0.45\textwidth]{nb_iter_sec_ex15_juqueen}
-\caption{Number of iterations per second with ex15 and the same parameters than in Table~\ref{tab:03}}
+\caption{Number of iterations per second with ex15 and the same parameters than in Table~\ref{tab:03} (weak scaling)}
 \label{fig:01}
 \end{figure}
 
@@ -965,6 +965,13 @@ In Table~\ref{tab:04}, some experiments with example ex54 on the Curie architect
 \end{center}
 \end{table*}
 
+\begin{figure}[htbp]
+\centering
+  \includegraphics[width=0.45\textwidth]{nb_iter_sec_ex54_curie}
+\caption{Number of iterations per second with ex54 and the same parameters than in Table~\ref{tab:05} (strong scaling)}
+\label{fig:02}
+\end{figure}
+
 %%%*********************************************************
 %%%*********************************************************