From: lilia <lilia@amazigh.bordeaux.inria.fr>
Date: Mon, 28 Apr 2014 15:23:57 +0000 (+0200)
Subject: Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/hpcc2014
X-Git-Tag: hpcc2014_submission~20
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/hpcc2014.git/commitdiff_plain/4661ca86a496894458d1605072a1624593e70ab5?ds=inline;hp=-c

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

4661ca86a496894458d1605072a1624593e70ab5
diff --combined hpcc.tex
index dc83bb4,37ad4e3..66dbbfc
--- a/hpcc.tex
+++ b/hpcc.tex
@@@ -251,8 -251,8 +251,8 @@@ SimGrid~\cite{SimGrid,casanova+legrand+
  framework to study the behavior of large-scale distributed systems.  As its name
  says, it emanates from the grid computing community, but is nowadays used to
  study grids, clouds, HPC or peer-to-peer systems.  The early versions of SimGrid
 -date from 1999, but it's still actively developed and distributed as an open
 -source software.  Today, it's one of the major generic tools in the field of
 +date from 1999, but it is still actively developed and distributed as an open
 +source software.  Today, it is one of the major generic tools in the field of
  simulation for large-scale distributed systems.
  
  SimGrid provides several programming interfaces: MSG to simulate Concurrent
@@@ -383,8 -383,8 +383,8 @@@ exchanged by message passing using MPI 
  
  \begin{figure}[!t]
  \centering
-   \includegraphics[width=60mm,keepaspectratio]{clustering2}
- \caption{Example of two distant clusters of processors.}
+   \includegraphics[width=60mm,keepaspectratio]{clustering}
+ \caption{Example of three distant clusters of processors.}
  \label{fig:4.1}
  \end{figure}