X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a8cd62135619ad52e05ae1c929ef07e166e4260..f4b7b8e6ce0fd35fc2ada5f5c06d212bcd2199c8:/examples/platforms/conf/gridpp_grid_2004.xml

diff --git a/examples/platforms/conf/gridpp_grid_2004.xml b/examples/platforms/conf/gridpp_grid_2004.xml
index d7a79173fd..af2d582016 100644
--- a/examples/platforms/conf/gridpp_grid_2004.xml
+++ b/examples/platforms/conf/gridpp_grid_2004.xml
@@ -49,27 +49,27 @@
 <!--33 Manc-->
 <!--34 Lanc-->
 <!--35 CERN-->
-	<host id="WC_Edi" power="1"/>
-	<host id="WC_Manc" power="1"/>
-	<host id="Gla_router" power="1"/>
-	<host id="Glasgow" power="20000000"/>
-	<host id="Edi" power="25600000"/>
-	<host id="Durham" power="4134000"/>
-	<host id="Sheffield" power="49640000"/>
-	<host id="Cam" power="1320000"/>
-	<host id="UCL" power="22500000"/>
-	<host id="IC" power="440000000"/>
-	<host id="QMW" power="44000000"/>
-	<host id="Brunel" power="85680000"/>
-	<host id="RHNBC" power="7200000"/>
-	<host id="Bristol" power="60000000"/>
-	<host id="RAL" power="556956000"/>
-	<host id="Oxford" power="156560000"/>
-	<host id="B_ham" power="13500000"/>
-	<host id="L_pool" power="308070000"/>
-	<host id="Manc" power="22500000"/>
-	<host id="Lanc" power="204800000"/>
-	<host id="CERN" power="1"/>
+	<host id="WC_Edi" power="1f"/>
+	<host id="WC_Manc" power="1f"/>
+	<host id="Gla_router" power="1f"/>
+	<host id="Glasgow" power="20Mf"/>
+	<host id="Edi" power="25.6Mf"/>
+	<host id="Durham" power="4.134Mf"/>
+	<host id="Sheffield" power="49.64Mf"/>
+	<host id="Cam" power="1.32Mf"/>
+	<host id="UCL" power="22.5Mf"/>
+	<host id="IC" power="440Mf"/>
+	<host id="QMW" power="44Mf"/>
+	<host id="Brunel" power="85.68Mf"/>
+	<host id="RHNBC" power="7.2Mf"/>
+	<host id="Bristol" power="60Mf"/>
+	<host id="RAL" power="556.956Mf"/>
+	<host id="Oxford" power="156.56Mf"/>
+	<host id="B_ham" power="13.5Mf"/>
+	<host id="L_pool" power="308.07Mf"/>
+	<host id="Manc" power="22.5Mf"/>
+	<host id="Lanc" power="204.8Mf"/>
+	<host id="CERN" power="1f"/>
 
 	<router id="WC_Gla"/>
 	<router id="WC_Leeds"/>
@@ -87,44 +87,44 @@
 	<router id="MidMAN"/>
 	<router id="NNW_router"/>
 
-	<link id="link0" bandwidth="10000"/>
-	<link id="link1" bandwidth="10000"/>
-	<link id="link2" bandwidth="1000"/>
-	<link id="link3" bandwidth="10000"/>
-	<link id="link4" bandwidth="1000"/>
-	<link id="link5" bandwidth="10000"/>
-	<link id="link6" bandwidth="10000"/>
-	<link id="link7" bandwidth="1000"/>
-	<link id="link8" bandwidth="1000"/>
-	<link id="link9" bandwidth="10000"/>
-	<link id="link10" bandwidth="622"/>
-	<link id="link11" bandwidth="1000"/>
-	<link id="link12" bandwidth="10000"/>
-	<link id="link13" bandwidth="10000"/>
-	<link id="link14" bandwidth="622"/>
-	<link id="link15" bandwidth="10000"/>
-	<link id="link16" bandwidth="1000"/>
-	<link id="link17" bandwidth="1000"/>
-	<link id="link18" bandwidth="10000"/>
-	<link id="link19" bandwidth="622"/>
-	<link id="link20" bandwidth="2500"/>
-	<link id="link21" bandwidth="1000"/>
-	<link id="link22" bandwidth="1000"/>
-	<link id="link23" bandwidth="155"/>
-	<link id="link24" bandwidth="155"/>
-	<link id="link25" bandwidth="155"/>
-	<link id="link26" bandwidth="155"/>
-	<link id="link27" bandwidth="155"/>
-	<link id="link28" bandwidth="155"/>
-	<link id="link29" bandwidth="155"/>
-	<link id="link30" bandwidth="155"/>
-	<link id="link31" bandwidth="622"/>
-	<link id="link32" bandwidth="622"/>
-	<link id="link33" bandwidth="622"/>
-	<link id="link34" bandwidth="622"/>
-	<link id="link35" bandwidth="155"/>
-	<link id="link36" bandwidth="1000"/>
-	<link id="link37" bandwidth="155"/>
+	<link id="link0" bandwidth="10kBps"/>
+	<link id="link1" bandwidth="10kBps"/>
+	<link id="link2" bandwidth="1kBps"/>
+	<link id="link3" bandwidth="10kBps"/>
+	<link id="link4" bandwidth="1kBps"/>
+	<link id="link5" bandwidth="10kBps"/>
+	<link id="link6" bandwidth="10kBps"/>
+	<link id="link7" bandwidth="1kBps"/>
+	<link id="link8" bandwidth="1kBps"/>
+	<link id="link9" bandwidth="10kBps"/>
+	<link id="link10" bandwidth="622Bps"/>
+	<link id="link11" bandwidth="1kBps"/>
+	<link id="link12" bandwidth="10kBps"/>
+	<link id="link13" bandwidth="10kBps"/>
+	<link id="link14" bandwidth="622Bps"/>
+	<link id="link15" bandwidth="10kBps"/>
+	<link id="link16" bandwidth="1kBps"/>
+	<link id="link17" bandwidth="1kBps"/>
+	<link id="link18" bandwidth="10kBps"/>
+	<link id="link19" bandwidth="622Bps"/>
+	<link id="link20" bandwidth="2.5kBps"/>
+	<link id="link21" bandwidth="1kBps"/>
+	<link id="link22" bandwidth="1kBps"/>
+	<link id="link23" bandwidth="155Bps"/>
+	<link id="link24" bandwidth="155Bps"/>
+	<link id="link25" bandwidth="155Bps"/>
+	<link id="link26" bandwidth="155Bps"/>
+	<link id="link27" bandwidth="155Bps"/>
+	<link id="link28" bandwidth="155Bps"/>
+	<link id="link29" bandwidth="155Bps"/>
+	<link id="link30" bandwidth="155Bps"/>
+	<link id="link31" bandwidth="622Bps"/>
+	<link id="link32" bandwidth="622Bps"/>
+	<link id="link33" bandwidth="622Bps"/>
+	<link id="link34" bandwidth="622Bps"/>
+	<link id="link35" bandwidth="155Bps"/>
+	<link id="link36" bandwidth="1kBps"/>
+	<link id="link37" bandwidth="155Bps"/>
 
 	<route src="WC_Gla" dst="WC_Gla">
 		<link_ctn id="link0"/>