Update XML files to version 4.

diff --git a/Dep.xml b/Dep.xml
index 821375da0c9c209afe9a399392bfce923167b379..1afd9b3b320ae8d98e276dcb80e0b48a6113b055 100644 (file)
--- a/Dep.xml
+++ b/Dep.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
   <process host="1" function="simulation_main">
     <argument value="777"/>
     <argument value="2"/>

diff --git a/Experimentations/cluster1024.xml b/Experimentations/cluster1024.xml
index f9773ca021c152728f4a212c72f24ff5b0ba79c2..2c673127554477142ab4d755c8f0ef30e130c67e 100644 (file)
--- a/Experimentations/cluster1024.xml
+++ b/Experimentations/cluster1024.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-101023"
-        power="1Gf"
+        speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
 </AS>

diff --git a/Experimentations/cluster16.xml b/Experimentations/cluster16.xml
index a4f45b8a9138aea5043367469ade4ee96094b137..18dcf1fd82b91666cc5e415e833f2e218bf793ba 100644 (file)
--- a/Experimentations/cluster16.xml
+++ b/Experimentations/cluster16.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100015"
-        power="1Gf"
+        speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
 </AS>

diff --git a/Experimentations/cluster256.xml b/Experimentations/cluster256.xml
index a05512da74f1d47c24518d944725ba5ff8f21483..59a8455761dadb73be20d2b7a803a0f101e6484d 100644 (file)
--- a/Experimentations/cluster256.xml
+++ b/Experimentations/cluster256.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100255"
-        power="1Gf"
+        speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
 </AS>

diff --git a/Experimentations/cluster4096.xml b/Experimentations/cluster4096.xml
index f166f79992b2d38c756253a2f2c181af55e0ff77..7491cd2dc2ad0d45a5eba9e84f437ae648669a5b 100644 (file)
--- a/Experimentations/cluster4096.xml
+++ b/Experimentations/cluster4096.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-104095"
-        power="1Gf"
+        speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
 </AS>

diff --git a/Experimentations/cluster64.xml b/Experimentations/cluster64.xml
index d51779e492a0b34d96be292a60298c003c9b134b..a55848e6aea0e6a27d30242d465a3344c95078eb 100644 (file)
--- a/Experimentations/cluster64.xml
+++ b/Experimentations/cluster64.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100063"
-        power="1Gf"
+        speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="SHARED"/>
 </AS>

diff --git a/Experimentations/g5k.xml b/Experimentations/g5k.xml
index cfde69d9b5dfe827218f3f8298991ce83a92b1dc..75eae066ff5a281a9312f551f04d8b894002e9cc 100644 (file)
--- a/Experimentations/g5k.xml
+++ b/Experimentations/g5k.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
 <!-- ....................................................... 24/09/2010 ... -->
@@ -56,128 +57,127 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=48    power=3.542E9
-        bordeplage - bordeaux | nodes=51    power=3.464E9
-        bordereau  - bordeaux | nodes=93    power=4.389E9
-        borderline - bordeaux | nodes=10    power=4.389E9
-        chicon     - lille    | nodes=26    power=4.384E9
-        chti       - lille    | nodes=20    power=4.311E9
-        chuque     - lille    | nodes=53    power=3.647E9
-        chinqchint - lille    | nodes=46    power=5.0E9     <- not correct
-        capricorne - lyon     | nodes=56    power=3.254E9
-        sagittaire - lyon     | nodes=79    power=3.865E9
-        grelon     - nancy    | nodes=120   power=3.185E9
-        griffon    - nancy    | nodes=92    power=5.0E9     <- not correct
-        gdx        - orsay    | nodes=216   power=3.388E9
-        gdx2       - orsay    | nodes=126   power=4.04E9
-        paramount  - rennes   | nodes=33    power=4.603E9
-        paraquad   - rennes   | nodes=64    power=4.603E9
-        paradent   - rennes   | nodes=64    power=5.0E9     <- not correct
-        parapide   - rennes   | nodes=25    power=5.0E9     <- not correct
-        azur       - sophia   | nodes=48    power=3.258E9
-        helios     - sophia   | nodes=56    power=3.675E9
-        sol        - sophia   | nodes=50    power=4.389E9
-        suno       - sophia   | nodes=45    power=5.0E9     <- not correct
-        pastel     - toulouse | nodes=80    power=4.389E9
-        violette   - toulouse | nodes=57    power=3.586E9
+        bordemer   - bordeaux | nodes=48    speed=3.542E9
+        bordeplage - bordeaux | nodes=51    speed=3.464E9
+        bordereau  - bordeaux | nodes=93    speed=4.389E9
+        borderline - bordeaux | nodes=10    speed=4.389E9
+        chicon     - lille    | nodes=26    speed=4.384E9
+        chti       - lille    | nodes=20    speed=4.311E9
+        chuque     - lille    | nodes=53    speed=3.647E9
+        chinqchint - lille    | nodes=46    speed=5.0E9     <- not correct
+        capricorne - lyon     | nodes=56    speed=3.254E9
+        sagittaire - lyon     | nodes=79    speed=3.865E9
+        grelon     - nancy    | nodes=120   speed=3.185E9
+        griffon    - nancy    | nodes=92    speed=5.0E9     <- not correct
+        gdx        - orsay    | nodes=216   speed=3.388E9
+        gdx2       - orsay    | nodes=126   speed=4.04E9
+        paramount  - rennes   | nodes=33    speed=4.603E9
+        paraquad   - rennes   | nodes=64    speed=4.603E9
+        paradent   - rennes   | nodes=64    speed=5.0E9     <- not correct
+        parapide   - rennes   | nodes=25    speed=5.0E9     <- not correct
+        azur       - sophia   | nodes=48    speed=3.258E9
+        helios     - sophia   | nodes=56    speed=3.675E9
+        sol        - sophia   | nodes=50    speed=4.389E9
+        suno       - sophia   | nodes=45    speed=5.0E9     <- not correct
+        pastel     - toulouse | nodes=80    speed=4.389E9
+        violette   - toulouse | nodes=57    speed=3.586E9
 -->
-<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
-   radical="1-48" power="3.542Gf" bw="125MBps" lat="100us"
+   radical="1-48" speed="3.542Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-   radical="1-51" power="3.464Gf" bw="125MBps" lat="100us"
+   radical="1-51" speed="3.464Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-   radical="1-93" power="4.389Gf" bw="125MBps" lat="100us"
+   radical="1-93" speed="4.389Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-   radical="1-10" power="4.389Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="4.389Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-26" power="4.384Gf" bw="125MBps" lat="100us"
+   radical="1-26" speed="4.384Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
-   radical="1-20" power="4.311Gf" bw="125MBps" lat="100us"
+   radical="1-20" speed="4.311Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chuque" prefix="chuque-" suffix=".lille.grid5000.fr"
-   radical="1-53" power="3.647Gf" bw="125MBps" lat="100us"
+   radical="1-53" speed="3.647Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-   radical="1-46" power="5Gf" bw="125MBps" lat="100us"
+   radical="1-46" speed="5Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-   radical="1-56" power="3.254Gf" bw="125MBps" lat="100us"
+   radical="1-56" speed="3.254Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-   radical="1-79" power="3.865Gf" bw="125MBps" lat="100us"
+   radical="1-79" speed="3.865Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-120" power="3.185Gf" bw="125MBps" lat="100us"
+   radical="1-120" speed="3.185Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
-   radical="1-92" power="5Gf" bw="125MBps" lat="100us"
+   radical="1-92" speed="5Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
-   radical="1-216" power="3.388Gf" bw="125MBps" lat="100us"
+   radical="1-216" speed="3.388Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
-   radical="1-126" power="4.04Gf" bw="125MBps" lat="100us"
+   radical="1-126" speed="4.04Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-   radical="1-33" power="4.603Gf" bw="125MBps" lat="100us"
+   radical="1-33" speed="4.603Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
-   radical="1-64" power="4.603Gf" bw="125MBps" lat="100us"
+   radical="1-64" speed="4.603Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-   radical="1-64" power="3.364Gf" bw="125MBps" lat="100us"
+   radical="1-64" speed="3.364Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-   radical="1-25" power="5Gf" bw="125MBps" lat="100us"
+   radical="1-25" speed="5Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-48" power="3.258Gf" bw="125MBps" lat="100us"
+   radical="1-48" speed="3.258Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-   radical="1-56" power="3.675Gf" bw="125MBps" lat="100us"
+   radical="1-56" speed="3.675Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-   radical="1-50" power="4.389Gf" bw="125MBps" lat="100us"
+   radical="1-50" speed="4.389Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-   radical="1-45" power="5Gf" bw="125MBps" lat="100us"
+   radical="1-45" speed="5Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-   radical="1-80" power="4.389Gf" bw="125MBps" lat="100us"
+   radical="1-80" speed="4.389Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-   radical="1-57" power="3.586Gf" bw="125MBps" lat="100us"
+   radical="1-57" speed="3.586Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 

diff --git a/Experimentations/grid1024.xml b/Experimentations/grid1024.xml
index 1c651349b7feb9213a8aed0af8e2b8c23966b308..7a0db508d3efee7f847a44f992977f767707e893 100644 (file)
--- a/Experimentations/grid1024.xml
+++ b/Experimentations/grid1024.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for a 1024 hosts grid, based on ........ -->
 <!-- ... Platform description file for GRID5000 ........................... -->
@@ -57,128 +58,127 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=43    power=1e9
-        bordeplage - bordeaux | nodes=43    power=1e9
-        bordereau  - bordeaux | nodes=43    power=1e9
-        borderline - bordeaux | nodes=42    power=1e9
-        chicon     - lille    | nodes=43    power=1e9
-        chti       - lille    | nodes=43    power=1e9
-        chuque     - lille    | nodes=43    power=1e9
-        chinqchint - lille    | nodes=42    power=1e9
-        capricorne - lyon     | nodes=43    power=1e9
-        sagittaire - lyon     | nodes=42    power=1e9
-        grelon     - nancy    | nodes=43    power=1e9
-        griffon    - nancy    | nodes=42    power=1e9
-        gdx        - orsay    | nodes=43    power=1e9
-        gdx2       - orsay    | nodes=42    power=1e9
-        paramount  - rennes   | nodes=43    power=1e9
-        paraquad   - rennes   | nodes=43    power=1e9
-        paradent   - rennes   | nodes=43    power=1e9
-        parapide   - rennes   | nodes=42    power=1e9
-        azur       - sophia   | nodes=43    power=1e9
-        helios     - sophia   | nodes=43    power=1e9
-        sol        - sophia   | nodes=43    power=1e9
-        suno       - sophia   | nodes=42    power=1e9
-        pastel     - toulouse | nodes=43    power=1e9
-        violette   - toulouse | nodes=42    power=1e9
+        bordemer   - bordeaux | nodes=43    speed=1e9
+        bordeplage - bordeaux | nodes=43    speed=1e9
+        bordereau  - bordeaux | nodes=43    speed=1e9
+        borderline - bordeaux | nodes=42    speed=1e9
+        chicon     - lille    | nodes=43    speed=1e9
+        chti       - lille    | nodes=43    speed=1e9
+        chuque     - lille    | nodes=43    speed=1e9
+        chinqchint - lille    | nodes=42    speed=1e9
+        capricorne - lyon     | nodes=43    speed=1e9
+        sagittaire - lyon     | nodes=42    speed=1e9
+        grelon     - nancy    | nodes=43    speed=1e9
+        griffon    - nancy    | nodes=42    speed=1e9
+        gdx        - orsay    | nodes=43    speed=1e9
+        gdx2       - orsay    | nodes=42    speed=1e9
+        paramount  - rennes   | nodes=43    speed=1e9
+        paraquad   - rennes   | nodes=43    speed=1e9
+        paradent   - rennes   | nodes=43    speed=1e9
+        parapide   - rennes   | nodes=42    speed=1e9
+        azur       - sophia   | nodes=43    speed=1e9
+        helios     - sophia   | nodes=43    speed=1e9
+        sol        - sophia   | nodes=43    speed=1e9
+        suno       - sophia   | nodes=42    speed=1e9
+        pastel     - toulouse | nodes=43    speed=1e9
+        violette   - toulouse | nodes=42    speed=1e9
 -->
-<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chuque" prefix="chuque-" suffix=".lille.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-   radical="1-43" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-43" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-   radical="1-42" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-42" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 

diff --git a/Experimentations/grid16.xml b/Experimentations/grid16.xml
index dd9b8e7edc65435b3e6f692d07b5e71d67e990fe..e279fee1bbf9dd84ee354cc070455a91cda72ed0 100644 (file)
--- a/Experimentations/grid16.xml
+++ b/Experimentations/grid16.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for a 16 hosts grid, based on .......... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
@@ -57,28 +58,27 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=4     power=1e9
-        chicon     - lille    | nodes=4     power=1e9
-        grelon     - nancy    | nodes=4     power=1e9
-        azur       - sophia   | nodes=4     power=1e9
+        bordemer   - bordeaux | nodes=4     speed=1e9
+        chicon     - lille    | nodes=4     speed=1e9
+        grelon     - nancy    | nodes=4     speed=1e9
+        azur       - sophia   | nodes=4     speed=1e9
 -->
-<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 

diff --git a/Experimentations/grid256.xml b/Experimentations/grid256.xml
index cc099bf7a2e023f4febd7e8e5ea4b42146a7127f..2ec975e185f00d4887ed715e68c790b3147dcb86 100644 (file)
--- a/Experimentations/grid256.xml
+++ b/Experimentations/grid256.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for a 256 hosts grid, based on ......... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
@@ -57,128 +58,127 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=11    power=1e9
-        bordeplage - bordeaux | nodes=11    power=1e9
-        bordereau  - bordeaux | nodes=11    power=1e9
-        borderline - bordeaux | nodes=10    power=1e9
-        chicon     - lille    | nodes=11    power=1e9
-        chti       - lille    | nodes=11    power=1e9
-        chuque     - lille    | nodes=11    power=1e9
-        chinqchint - lille    | nodes=10    power=1e9
-        capricorne - lyon     | nodes=11    power=1e9
-        sagittaire - lyon     | nodes=10    power=1e9
-        grelon     - nancy    | nodes=11    power=1e9
-        griffon    - nancy    | nodes=10    power=1e9
-        gdx        - orsay    | nodes=11    power=1e9
-        gdx2       - orsay    | nodes=10    power=1e9
-        paramount  - rennes   | nodes=11    power=1e9
-        paraquad   - rennes   | nodes=11    power=1e9
-        paradent   - rennes   | nodes=11    power=1e9
-        parapide   - rennes   | nodes=10    power=1e9
-        azur       - sophia   | nodes=11    power=1e9
-        helios     - sophia   | nodes=11    power=1e9
-        sol        - sophia   | nodes=11    power=1e9
-        suno       - sophia   | nodes=10    power=1e9
-        pastel     - toulouse | nodes=11    power=1e9
-        violette   - toulouse | nodes=10    power=1e9
+        bordemer   - bordeaux | nodes=11    speed=1e9
+        bordeplage - bordeaux | nodes=11    speed=1e9
+        bordereau  - bordeaux | nodes=11    speed=1e9
+        borderline - bordeaux | nodes=10    speed=1e9
+        chicon     - lille    | nodes=11    speed=1e9
+        chti       - lille    | nodes=11    speed=1e9
+        chuque     - lille    | nodes=11    speed=1e9
+        chinqchint - lille    | nodes=10    speed=1e9
+        capricorne - lyon     | nodes=11    speed=1e9
+        sagittaire - lyon     | nodes=10    speed=1e9
+        grelon     - nancy    | nodes=11    speed=1e9
+        griffon    - nancy    | nodes=10    speed=1e9
+        gdx        - orsay    | nodes=11    speed=1e9
+        gdx2       - orsay    | nodes=10    speed=1e9
+        paramount  - rennes   | nodes=11    speed=1e9
+        paraquad   - rennes   | nodes=11    speed=1e9
+        paradent   - rennes   | nodes=11    speed=1e9
+        parapide   - rennes   | nodes=10    speed=1e9
+        azur       - sophia   | nodes=11    speed=1e9
+        helios     - sophia   | nodes=11    speed=1e9
+        sol        - sophia   | nodes=11    speed=1e9
+        suno       - sophia   | nodes=10    speed=1e9
+        pastel     - toulouse | nodes=11    speed=1e9
+        violette   - toulouse | nodes=10    speed=1e9
 -->
-<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chuque" prefix="chuque-" suffix=".lille.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-   radical="1-11" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-11" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-   radical="1-10" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-10" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 

diff --git a/Experimentations/grid4096.xml b/Experimentations/grid4096.xml
index f780119c14ad27e926538163d70bac7ae9093c3a..e40ac9c4184e65e6a1c060c7dc76c06363ac99ad 100644 (file)
--- a/Experimentations/grid4096.xml
+++ b/Experimentations/grid4096.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for a 4096 hosts grid, based on ........ -->
 <!-- ... Platform description file for GRID5000 ........................... -->
@@ -57,128 +58,127 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=171   power=1e9
-        bordeplage - bordeaux | nodes=171   power=1e9
-        bordereau  - bordeaux | nodes=171   power=1e9
-        borderline - bordeaux | nodes=170   power=1e9
-        chicon     - lille    | nodes=171   power=1e9
-        chti       - lille    | nodes=171   power=1e9
-        chuque     - lille    | nodes=171   power=1e9
-        chinqchint - lille    | nodes=170   power=1e9
-        capricorne - lyon     | nodes=171   power=1e9
-        sagittaire - lyon     | nodes=170   power=1e9
-        grelon     - nancy    | nodes=171   power=1e9
-        griffon    - nancy    | nodes=170   power=1e9
-        gdx        - orsay    | nodes=171   power=1e9
-        gdx2       - orsay    | nodes=170   power=1e9
-        paramount  - rennes   | nodes=171   power=1e9
-        paraquad   - rennes   | nodes=171   power=1e9
-        paradent   - rennes   | nodes=171   power=1e9
-        parapide   - rennes   | nodes=170   power=1e9
-        azur       - sophia   | nodes=171   power=1e9
-        helios     - sophia   | nodes=171   power=1e9
-        sol        - sophia   | nodes=171   power=1e9
-        suno       - sophia   | nodes=170   power=1e9
-        pastel     - toulouse | nodes=171   power=1e9
-        violette   - toulouse | nodes=170   power=1e9
+        bordemer   - bordeaux | nodes=171   speed=1e9
+        bordeplage - bordeaux | nodes=171   speed=1e9
+        bordereau  - bordeaux | nodes=171   speed=1e9
+        borderline - bordeaux | nodes=170   speed=1e9
+        chicon     - lille    | nodes=171   speed=1e9
+        chti       - lille    | nodes=171   speed=1e9
+        chuque     - lille    | nodes=171   speed=1e9
+        chinqchint - lille    | nodes=170   speed=1e9
+        capricorne - lyon     | nodes=171   speed=1e9
+        sagittaire - lyon     | nodes=170   speed=1e9
+        grelon     - nancy    | nodes=171   speed=1e9
+        griffon    - nancy    | nodes=170   speed=1e9
+        gdx        - orsay    | nodes=171   speed=1e9
+        gdx2       - orsay    | nodes=170   speed=1e9
+        paramount  - rennes   | nodes=171   speed=1e9
+        paraquad   - rennes   | nodes=171   speed=1e9
+        paradent   - rennes   | nodes=171   speed=1e9
+        parapide   - rennes   | nodes=170   speed=1e9
+        azur       - sophia   | nodes=171   speed=1e9
+        helios     - sophia   | nodes=171   speed=1e9
+        sol        - sophia   | nodes=171   speed=1e9
+        suno       - sophia   | nodes=170   speed=1e9
+        pastel     - toulouse | nodes=171   speed=1e9
+        violette   - toulouse | nodes=170   speed=1e9
 -->
-<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordereau" prefix="bordereau-" suffix=".bordeaux.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_borderline" prefix="borderline-" suffix=".bordeaux.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chuque" prefix="chuque-" suffix=".lille.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chinqchint" prefix="chinqchint-" suffix=".lille.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paradent" prefix="paradent-" suffix=".rennes.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_parapide" prefix="parapide-" suffix=".rennes.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sol" prefix="sol-" suffix=".sophia.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_suno" prefix="suno-" suffix=".sophia.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-   radical="1-171" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-171" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-   radical="1-170" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-170" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 

diff --git a/Experimentations/grid64.xml b/Experimentations/grid64.xml
index 53158d9ae7357d591959496ea9f7237a6e778bbd..2eef3b64cbbdc5696cc20bae9052218081374d13 100644 (file)
--- a/Experimentations/grid64.xml
+++ b/Experimentations/grid64.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <!-- ...................................................................... -->
 <!-- ... Platform description file for a 64 hosts grid, based on .......... -->
 <!-- ... Platform description file for GRID5000 ........................... -->
@@ -57,88 +58,87 @@
 
      ../ Cluster description /.............................................
 
-        bordemer   - bordeaux | nodes=4     power=1e9
-        bordeplage - bordeaux | nodes=4     power=1e9
-        chicon     - lille    | nodes=4     power=1e9
-        chti       - lille    | nodes=4     power=1e9
-        capricorne - lyon     | nodes=4     power=1e9
-        sagittaire - lyon     | nodes=4     power=1e9
-        grelon     - nancy    | nodes=4     power=1e9
-        griffon    - nancy    | nodes=4     power=1e9
-        gdx        - orsay    | nodes=4     power=1e9
-        gdx2       - orsay    | nodes=4     power=1e9
-        paramount  - rennes   | nodes=4     power=1e9
-        paraquad   - rennes   | nodes=4     power=1e9
-        azur       - sophia   | nodes=4     power=1e9
-        helios     - sophia   | nodes=4     power=1e9
-        pastel     - toulouse | nodes=4     power=1e9
-        violette   - toulouse | nodes=4     power=1e9
+        bordemer   - bordeaux | nodes=4     speed=1e9
+        bordeplage - bordeaux | nodes=4     speed=1e9
+        chicon     - lille    | nodes=4     speed=1e9
+        chti       - lille    | nodes=4     speed=1e9
+        capricorne - lyon     | nodes=4     speed=1e9
+        sagittaire - lyon     | nodes=4     speed=1e9
+        grelon     - nancy    | nodes=4     speed=1e9
+        griffon    - nancy    | nodes=4     speed=1e9
+        gdx        - orsay    | nodes=4     speed=1e9
+        gdx2       - orsay    | nodes=4     speed=1e9
+        paramount  - rennes   | nodes=4     speed=1e9
+        paraquad   - rennes   | nodes=4     speed=1e9
+        azur       - sophia   | nodes=4     speed=1e9
+        helios     - sophia   | nodes=4     speed=1e9
+        pastel     - toulouse | nodes=4     speed=1e9
+        violette   - toulouse | nodes=4     speed=1e9
 -->
-<platform version="3">
 <AS id="AS_grid5000" routing="Floyd" >
 
   <cluster id="AS_bordemer" prefix="bordemer-" suffix=".bordeaux.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_bordeplage" prefix="bordeplage-" suffix=".bordeaux.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chicon" prefix="chicon-" suffix=".lille.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_chti" prefix="chti-" suffix=".lille.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_capricorne" prefix="capricorne-" suffix=".lyon.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_sagittaire" prefix="sagittaire-" suffix=".lyon.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_grelon" prefix="grelon-" suffix=".nancy.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_griffon" prefix="griffon-" suffix=".nancy.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx" prefix="gdx-" suffix=".orsay.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_gdx2" prefix="gdx2-" suffix=".orsay.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paramount" prefix="paramount-" suffix=".rennes.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_paraquad" prefix="paraquad-" suffix=".rennes.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_azur" prefix="azur-" suffix=".sophia.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_helios" prefix="helios-" suffix=".sophia.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_pastel" prefix="pastel-" suffix=".toulouse.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
   <cluster id="AS_violette" prefix="violette-" suffix=".toulouse.grid5000.fr"
-   radical="1-4" power="1Gf" bw="125MBps" lat="100us"
+   radical="1-4" speed="1Gf" bw="125MBps" lat="100us"
    bb_bw="1.25GBps" bb_lat="100us"></cluster>
 
 

diff --git a/Plat.xml b/Plat.xml
index d99c795eb497b886a680df90d1c4c8b367cacc42..cd8779a439c5c3bc07037f2e043c9ad92acffcf4 100644 (file)
--- a/Plat.xml
+++ b/Plat.xml
@@ -1,57 +1,57 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
  <AS  id="AS0"  routing="Full">
-  <host id="1" power="98.095Mf"/>
-  <host id="2" power="98.095Mf"/>
-  <host id="3" power="98.095Mf"/>
-  <host id="4" power="98.095Mf"/>
-  <host id="5" power="98.095Mf"/>
-  <host id="6" power="98.095Mf"/>
-  <host id="7" power="98.095Mf"/>
-  <host id="8" power="98.095Mf"/>
-  <host id="9" power="98.095Mf"/>
-  <host id="10" power="98.095Mf"/>
-  <host id="11" power="98.095Mf"/>
-  <host id="12" power="98.095Mf"/>
-  <host id="13" power="98.095Mf"/>
-  <host id="14" power="98.095Mf"/>
-  <host id="15" power="98.095Mf"/>
-  <host id="16" power="98.095Mf"/>
-  <host id="17" power="98.095Mf"/>
-  <host id="18" power="98.095Mf"/>
-  <host id="19" power="98.095Mf"/>
-  <host id="20" power="98.095Mf"/>
-  <host id="21" power="98.095Mf"/>
-  <host id="22" power="98.095Mf"/>
-  <host id="23" power="98.095Mf"/>
-  <host id="24" power="98.095Mf"/>
-  <host id="25" power="98.095Mf"/>
-  <host id="26" power="98.095Mf"/>
-  <host id="27" power="98.095Mf"/>
-  <host id="28" power="98.095Mf"/>
-  <host id="29" power="98.095Mf"/>
-  <host id="30" power="98.095Mf"/>
-  <host id="31" power="98.095Mf"/>
-  <host id="32" power="98.095Mf"/>
-  <host id="33" power="98.095Mf"/>
-  <host id="34" power="98.095Mf"/>
-  <host id="35" power="98.095Mf"/>
-  <host id="36" power="98.095Mf"/>
-  <host id="37" power="98.095Mf"/>
-  <host id="38" power="98.095Mf"/>
-  <host id="39" power="98.095Mf"/>
-  <host id="40" power="98.095Mf"/>
-  <host id="41" power="98.095Mf"/>
-  <host id="42" power="98.095Mf"/>
-  <host id="43" power="98.095Mf"/>
-  <host id="44" power="98.095Mf"/>
-  <host id="45" power="98.095Mf"/>
-  <host id="46" power="98.095Mf"/>
-  <host id="47" power="98.095Mf"/>
-  <host id="48" power="98.095Mf"/>
-  <host id="49" power="98.095Mf"/>
-  <host id="50" power="98.095Mf"/>
+  <host id="1" speed="98.095Mf"/>
+  <host id="2" speed="98.095Mf"/>
+  <host id="3" speed="98.095Mf"/>
+  <host id="4" speed="98.095Mf"/>
+  <host id="5" speed="98.095Mf"/>
+  <host id="6" speed="98.095Mf"/>
+  <host id="7" speed="98.095Mf"/>
+  <host id="8" speed="98.095Mf"/>
+  <host id="9" speed="98.095Mf"/>
+  <host id="10" speed="98.095Mf"/>
+  <host id="11" speed="98.095Mf"/>
+  <host id="12" speed="98.095Mf"/>
+  <host id="13" speed="98.095Mf"/>
+  <host id="14" speed="98.095Mf"/>
+  <host id="15" speed="98.095Mf"/>
+  <host id="16" speed="98.095Mf"/>
+  <host id="17" speed="98.095Mf"/>
+  <host id="18" speed="98.095Mf"/>
+  <host id="19" speed="98.095Mf"/>
+  <host id="20" speed="98.095Mf"/>
+  <host id="21" speed="98.095Mf"/>
+  <host id="22" speed="98.095Mf"/>
+  <host id="23" speed="98.095Mf"/>
+  <host id="24" speed="98.095Mf"/>
+  <host id="25" speed="98.095Mf"/>
+  <host id="26" speed="98.095Mf"/>
+  <host id="27" speed="98.095Mf"/>
+  <host id="28" speed="98.095Mf"/>
+  <host id="29" speed="98.095Mf"/>
+  <host id="30" speed="98.095Mf"/>
+  <host id="31" speed="98.095Mf"/>
+  <host id="32" speed="98.095Mf"/>
+  <host id="33" speed="98.095Mf"/>
+  <host id="34" speed="98.095Mf"/>
+  <host id="35" speed="98.095Mf"/>
+  <host id="36" speed="98.095Mf"/>
+  <host id="37" speed="98.095Mf"/>
+  <host id="38" speed="98.095Mf"/>
+  <host id="39" speed="98.095Mf"/>
+  <host id="40" speed="98.095Mf"/>
+  <host id="41" speed="98.095Mf"/>
+  <host id="42" speed="98.095Mf"/>
+  <host id="43" speed="98.095Mf"/>
+  <host id="44" speed="98.095Mf"/>
+  <host id="45" speed="98.095Mf"/>
+  <host id="46" speed="98.095Mf"/>
+  <host id="47" speed="98.095Mf"/>
+  <host id="48" speed="98.095Mf"/>
+  <host id="49" speed="98.095Mf"/>
+  <host id="50" speed="98.095Mf"/>
   <link id="unique" bandwidth="100MBps" latency="100us"/>
   <route src="1" dst="2">
     <link_ctn id="unique"/>

diff --git a/cluster1000.xml b/cluster1000.xml
index 5f1366db6bbe760ef465ee4981a69c4f8a47d985..903c861bae311dc1cd9357a2d59cd3839bea6fc3 100644 (file)
--- a/cluster1000.xml
+++ b/cluster1000.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100999"
-        power="1Gf"
+        speed="1Gf"
         bw="125MBps"     lat="50us"
         bb_bw="2.25GBps" bb_lat="500us" bb_sharing_policy="FATPIPE"/>
 </AS>

diff --git a/deployment.xml b/deployment.xml
index 8c1438404e4d7be60c61a87be717391e6e9efba7..fb44d0464df644a3ba867cc2e944c9f383660009 100644 (file)
--- a/deployment.xml
+++ b/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
   <process host="Tremblay" function="simulation_main">
     <argument value="5"/>
     <argument value="Jupiter"/>

diff --git a/machines1000.xml b/machines1000.xml
index 36e806d80c31ef32d2c4d025261d4dae469ac382..1167a65273da7b22d9ab23e92a4a48f509cebd5a 100644 (file)
--- a/machines1000.xml
+++ b/machines1000.xml
@@ -1,9 +1,9 @@
 <?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100999"
-        power="1Gf"
+        speed="1Gf"
         bw="1.25MBps"     lat="50us"
         bb_bw="22.5MBps" bb_lat="500us" bb_sharing_policy="FATPIPE"/>
 </AS>

diff --git a/platform.xml b/platform.xml
index 677a35d23bc9437c7d3e4d2d108220748142afb8..0216c08ad64d178c37083cbec8bf58ab3c7238ba 100644 (file)
--- a/platform.xml
+++ b/platform.xml
@@ -1,13 +1,13 @@
 <?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
- <platform version="3">
+<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
+<platform version="4">
  <AS  id="AS0"  routing="Full">
    <!-- ljlkj -->
-   <host id="Tremblay" power="98.095Mf"/>
-   <host id="Jupiter" power="76.296Mf"/>
-   <host id="Fafard" power="76.296Mf"/>
-   <host id="Ginette" power="48.492Mf"/>
-   <host id="Bourassa" power="48.492Mf"/>
+   <host id="Tremblay" speed="98.095Mf"/>
+   <host id="Jupiter" speed="76.296Mf"/>
+   <host id="Fafard" speed="76.296Mf"/>
+   <host id="Ginette" speed="48.492Mf"/>
+   <host id="Bourassa" speed="48.492Mf"/>
    <link id="6" bandwidth="41.279125MBps" latency="59.904us"/>
    <link id="11" bandwidth="252.75kBps" latency="5.70455ms"/>
    <link id="3" bandwidth="34.285625MBps" latency="514.433us"/>