Commentaires

Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/hpcc2014

Conflicts:
	hpcc.tex

diff --cc hpcc.tex
index 3d920650a3ae7dcf62da610fec38fd08466b6b8c,77f7248e7ec920f5441e4c9e81178c6f34d6eb34..b857d5cbd0ed5b22d597c4bd65982acda5315199
--- 1/hpcc.tex
--- 2/hpcc.tex
+++ b/hpcc.tex
@@@ -555,10 -553,7 +555,14 @@@ lat latency, \dots{})
        \item Maximum number of internal and external iterations;
        \item Internal and external precisions;
        \item Matrix size $N_x$, $N_y$ and $N_z$;
++<<<<<<< HEAD
 +      \item Matrix diagonal value: \np{6.0};
 +      \item Matrix Off-diagonal value: \np{-1};
 +       \LZK{Off-diagonal values? (-1?)}
 +       \CER{oui}
++=======
+       \item Matrix diagonal value: \np{6.0}, \LZK{Off-diagonal values? (-1.0?)}
++>>>>>>> 5fb6769d88c1720b6480a28521119ef010462fa6
        \item Execution Mode: synchronous or asynchronous.
  \end{itemize}