From: RCE <cramamonjisoa@bilbo.iut-bm.univ-fcomte.fr>
Date: Tue, 22 Apr 2014 22:45:55 +0000 (+0200)
Subject: Commentaires
X-Git-Tag: hpcc2014_submission~82
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/commitdiff_plain/9e58442a55b1f2eda6edb277b367dc4e34f1fa1e?ds=inline;hp=--cc

Commentaires

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

Conflicts:
	hpcc.tex
---

9e58442a55b1f2eda6edb277b367dc4e34f1fa1e
diff --cc hpcc.tex
index 3d92065,77f7248..b857d5c
--- a/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}