X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ab9642a5bc0ad4cc31993e6ee9754bf94f269dcb..8a30d839e791237688f68d4047fef5a30293dfc4:/examples/platforms/conf/lcg_sept2004_grid.xml

diff --git a/examples/platforms/conf/lcg_sept2004_grid.xml b/examples/platforms/conf/lcg_sept2004_grid.xml
index c97214e352..ff087fe7f3 100644
--- a/examples/platforms/conf/lcg_sept2004_grid.xml
+++ b/examples/platforms/conf/lcg_sept2004_grid.xml
@@ -2,74 +2,74 @@
 <!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
 <platform version="3">
 <AS  id="AS0"  routing="Floyd">
-	<host id="0" power="1470000000000"/>
-	<host id="1" power="1820000000"/>
-	<host id="2" power="1"/>
-	<host id="4" power="593460000000"/>
-	<host id="5" power="560000000"/>
-	<host id="6" power="560000000"/>
-	<host id="7" power="560000000"/>
-	<host id="8" power="96000000"/>
-	<host id="9" power="7680000000"/>
-	<host id="10" power="910000000"/>
-	<host id="12" power="250000000"/>
-	<host id="13" power="448000000"/>
-	<host id="15" power="12500000"/>
-	<host id="16" power="12500000"/>
-	<host id="18" power="78000000"/>
-	<host id="20" power="560000000"/>
-	<host id="23" power="60000000"/>
-	<host id="24" power="154524000000"/>
-	<host id="25" power="60000000"/>
-	<host id="26" power="60000000"/>
-	<host id="27" power="60000000"/>
-	<host id="28" power="60000000"/>
-	<host id="29" power="60000000"/>
-	<host id="30" power="60000000"/>
-	<host id="31" power="1"/>
-	<host id="32" power="2100000000"/>
-	<host id="33" power="21000000000"/>
-	<host id="35" power="442000000"/>
-	<host id="36" power="6500000000"/>
-	<host id="38" power="300000000"/>
-	<host id="39" power="1200000000"/>
-	<host id="42" power="540000000"/>
-	<host id="43" power="390000000"/>
-	<host id="44" power="208000000"/>
-	<host id="45" power="600000000"/>
-	<host id="49" power="44352000000"/>
-	<host id="50" power="4564000000"/>
-	<host id="52" power="78522000000"/>
-	<host id="54" power="9200000000"/>
-	<host id="56" power="142476000000"/>
-	<host id="57" power="448000000"/>
-	<host id="59" power="3780000000"/>
-	<host id="60" power="250000000"/>
-	<host id="61" power="650000000"/>
-	<host id="64" power="9200000000"/>
-	<host id="65" power="250000000"/>
-	<host id="66" power="250000000"/>
-	<host id="67" power="592000000"/>
-	<host id="68" power="250000000"/>
-	<host id="69" power="250000000"/>
-	<host id="70" power="250000000"/>
-	<host id="71" power="4000000"/>
-	<host id="72" power="250000000"/>
-	<host id="73" power="250000000"/>
-	<host id="74" power="1"/>
-	<host id="75" power="53600000000"/>
-	<host id="77" power="14248000000"/>
-	<host id="79" power="24000000"/>
-	<host id="82" power="240000000"/>
-	<host id="83" power="2560000000"/>
-	<host id="86" power="2280000000"/>
-	<host id="89" power="20000000"/>
-	<host id="93" power="250000000"/>
-	<host id="95" power="8636000000"/>
-	<host id="97" power="250000000"/>
-	<host id="98" power="250000000"/>
-	<host id="99" power="28098000000"/>
-	<host id="100" power="250000000"/>
+	<host id="0" power="1.47tf"/>
+	<host id="1" power="1.82gf"/>
+	<host id="2" power="1f"/>
+	<host id="4" power="593.46gf"/>
+	<host id="5" power="560mf"/>
+	<host id="6" power="560mf"/>
+	<host id="7" power="560mf"/>
+	<host id="8" power="96mf"/>
+	<host id="9" power="7.68gf"/>
+	<host id="10" power="910mf"/>
+	<host id="12" power="250mf"/>
+	<host id="13" power="448mf"/>
+	<host id="15" power="12.5mf"/>
+	<host id="16" power="12.5mf"/>
+	<host id="18" power="78mf"/>
+	<host id="20" power="560mf"/>
+	<host id="23" power="60mf"/>
+	<host id="24" power="154.524gf"/>
+	<host id="25" power="60mf"/>
+	<host id="26" power="60mf"/>
+	<host id="27" power="60mf"/>
+	<host id="28" power="60mf"/>
+	<host id="29" power="60mf"/>
+	<host id="30" power="60mf"/>
+	<host id="31" power="1f"/>
+	<host id="32" power="2.1gf"/>
+	<host id="33" power="21gf"/>
+	<host id="35" power="442mf"/>
+	<host id="36" power="6.5gf"/>
+	<host id="38" power="300mf"/>
+	<host id="39" power="1.2gf"/>
+	<host id="42" power="540mf"/>
+	<host id="43" power="390mf"/>
+	<host id="44" power="208mf"/>
+	<host id="45" power="600mf"/>
+	<host id="49" power="44.352gf"/>
+	<host id="50" power="4.564gf"/>
+	<host id="52" power="78.522gf"/>
+	<host id="54" power="9.2gf"/>
+	<host id="56" power="142.476gf"/>
+	<host id="57" power="448mf"/>
+	<host id="59" power="3.78gf"/>
+	<host id="60" power="250mf"/>
+	<host id="61" power="650mf"/>
+	<host id="64" power="9.2gf"/>
+	<host id="65" power="250mf"/>
+	<host id="66" power="250mf"/>
+	<host id="67" power="592mf"/>
+	<host id="68" power="250mf"/>
+	<host id="69" power="250mf"/>
+	<host id="70" power="250mf"/>
+	<host id="71" power="4mf"/>
+	<host id="72" power="250mf"/>
+	<host id="73" power="250mf"/>
+	<host id="74" power="1f"/>
+	<host id="75" power="53.6gf"/>
+	<host id="77" power="14.248gf"/>
+	<host id="79" power="24mf"/>
+	<host id="82" power="240mf"/>
+	<host id="83" power="2.56gf"/>
+	<host id="86" power="2.28gf"/>
+	<host id="89" power="20mf"/>
+	<host id="93" power="250mf"/>
+	<host id="95" power="8.636gf"/>
+	<host id="97" power="250mf"/>
+	<host id="98" power="250mf"/>
+	<host id="99" power="28.098gf"/>
+	<host id="100" power="250mf"/>
 
 	<router id="3"/>
 	<router id="11"/>
@@ -105,133 +105,133 @@
 	<router id="94"/>
 	<router id="96"/>
 
-	<link id="link0" bandwidth="1000"/>
-	<link id="link1" bandwidth="10000"/>
-	<link id="link2" bandwidth="10000"/>
-	<link id="link3" bandwidth="155"/>
-	<link id="link4" bandwidth="10000"/>
-	<link id="link5" bandwidth="10000"/>
-	<link id="link6" bandwidth="10000"/>
-	<link id="link7" bandwidth="155"/>
-	<link id="link8" bandwidth="155"/>
-	<link id="link9" bandwidth="155"/>
-	<link id="link10" bandwidth="155"/>
-	<link id="link11" bandwidth="155"/>
-	<link id="link12" bandwidth="155"/>
-	<link id="link13" bandwidth="155"/>
-	<link id="link14" bandwidth="155"/>
-	<link id="link15" bandwidth="10000"/>
-	<link id="link16" bandwidth="10000"/>
-	<link id="link17" bandwidth="155"/>
-	<link id="link18" bandwidth="155"/>
-	<link id="link19" bandwidth="155"/>
-	<link id="link20" bandwidth="155"/>
-	<link id="link21" bandwidth="155"/>
-	<link id="link22" bandwidth="622"/>
-	<link id="link23" bandwidth="622"/>
-	<link id="link24" bandwidth="155"/>
-	<link id="link25" bandwidth="10000"/>
-	<link id="link26" bandwidth="2500"/>
-	<link id="link27" bandwidth="155"/>
-	<link id="link28" bandwidth="2500"/>
-	<link id="link29" bandwidth="1000"/>
-	<link id="link30" bandwidth="10000"/>
-	<link id="link31" bandwidth="10000"/>
-	<link id="link32" bandwidth="155"/>
-	<link id="link33" bandwidth="1000"/>
-	<link id="link34" bandwidth="155"/>
-	<link id="link35" bandwidth="155"/>
-	<link id="link36" bandwidth="155"/>
-	<link id="link37" bandwidth="155"/>
-	<link id="link38" bandwidth="155"/>
-	<link id="link39" bandwidth="155"/>
-	<link id="link40" bandwidth="1000"/>
-	<link id="link41" bandwidth="1000"/>
-	<link id="link42" bandwidth="10000"/>
-	<link id="link43" bandwidth="2500"/>
-	<link id="link44" bandwidth="10000"/>
-	<link id="link45" bandwidth="155"/>
-	<link id="link46" bandwidth="155"/>
-	<link id="link47" bandwidth="2500"/>
-	<link id="link48" bandwidth="155"/>
-	<link id="link49" bandwidth="155"/>
-	<link id="link50" bandwidth="10000"/>
-	<link id="link51" bandwidth="155"/>
-	<link id="link52" bandwidth="10000"/>
-	<link id="link53" bandwidth="155"/>
-	<link id="link54" bandwidth="155"/>
-	<link id="link55" bandwidth="155"/>
-	<link id="link56" bandwidth="155"/>
-	<link id="link57" bandwidth="2500"/>
-	<link id="link58" bandwidth="1000"/>
-	<link id="link59" bandwidth="10000"/>
-	<link id="link60" bandwidth="2500"/>
-	<link id="link61" bandwidth="2500"/>
-	<link id="link62" bandwidth="155"/>
-	<link id="link63" bandwidth="10000"/>
-	<link id="link64" bandwidth="10000"/>
-	<link id="link65" bandwidth="1000"/>
-	<link id="link66" bandwidth="155"/>
-	<link id="link67" bandwidth="10000"/>
-	<link id="link68" bandwidth="10000"/>
-	<link id="link69" bandwidth="1000"/>
-	<link id="link70" bandwidth="10000"/>
-	<link id="link71" bandwidth="1000"/>
-	<link id="link72" bandwidth="10000"/>
-	<link id="link73" bandwidth="622"/>
-	<link id="link74" bandwidth="1000"/>
-	<link id="link75" bandwidth="1000"/>
-	<link id="link76" bandwidth="1000"/>
-	<link id="link77" bandwidth="10000"/>
-	<link id="link78" bandwidth="155"/>
-	<link id="link79" bandwidth="155"/>
-	<link id="link80" bandwidth="155"/>
-	<link id="link81" bandwidth="155"/>
-	<link id="link82" bandwidth="155"/>
-	<link id="link83" bandwidth="155"/>
-	<link id="link84" bandwidth="155"/>
-	<link id="link85" bandwidth="155"/>
-	<link id="link86" bandwidth="155"/>
-	<link id="link87" bandwidth="155"/>
-	<link id="link88" bandwidth="155"/>
-	<link id="link89" bandwidth="2500"/>
-	<link id="link90" bandwidth="10000"/>
-	<link id="link91" bandwidth="3000"/>
-	<link id="link92" bandwidth="3000"/>
-	<link id="link93" bandwidth="10000"/>
-	<link id="link94" bandwidth="10000"/>
-	<link id="link95" bandwidth="622"/>
-	<link id="link96" bandwidth="622"/>
-	<link id="link97" bandwidth="1000"/>
-	<link id="link98" bandwidth="3000"/>
-	<link id="link99" bandwidth="3000"/>
-	<link id="link100" bandwidth="10000"/>
-	<link id="link101" bandwidth="2500"/>
-	<link id="link102" bandwidth="155"/>
-	<link id="link103" bandwidth="10000"/>
-	<link id="link104" bandwidth="10000"/>
-	<link id="link105" bandwidth="155"/>
-	<link id="link106" bandwidth="155"/>
-	<link id="link107" bandwidth="10000"/>
-	<link id="link108" bandwidth="10000"/>
-	<link id="link109" bandwidth="10000"/>
-	<link id="link110" bandwidth="155"/>
-	<link id="link111" bandwidth="10000"/>
-	<link id="link112" bandwidth="10000"/>
-	<link id="link113" bandwidth="3000"/>
-	<link id="link114" bandwidth="155"/>
-	<link id="link115" bandwidth="3000"/>
-	<link id="link116" bandwidth="10000"/>
-	<link id="link117" bandwidth="622"/>
-	<link id="link118" bandwidth="155"/>
-	<link id="link119" bandwidth="33"/>
-	<link id="link120" bandwidth="1000"/>
-	<link id="link121" bandwidth="622"/>
-	<link id="link122" bandwidth="155"/>
-	<link id="link123" bandwidth="155"/>
-	<link id="link124" bandwidth="155"/>
-	<link id="link125" bandwidth="155"/>
-	<link id="link126" bandwidth="622"/>
+	<link id="link0" bandwidth="1KBps"/>
+	<link id="link1" bandwidth="10KBps"/>
+	<link id="link2" bandwidth="10KBps"/>
+	<link id="link3" bandwidth="155Bps"/>
+	<link id="link4" bandwidth="10KBps"/>
+	<link id="link5" bandwidth="10KBps"/>
+	<link id="link6" bandwidth="10KBps"/>
+	<link id="link7" bandwidth="155Bps"/>
+	<link id="link8" bandwidth="155Bps"/>
+	<link id="link9" bandwidth="155Bps"/>
+	<link id="link10" bandwidth="155Bps"/>
+	<link id="link11" bandwidth="155Bps"/>
+	<link id="link12" bandwidth="155Bps"/>
+	<link id="link13" bandwidth="155Bps"/>
+	<link id="link14" bandwidth="155Bps"/>
+	<link id="link15" bandwidth="10KBps"/>
+	<link id="link16" bandwidth="10KBps"/>
+	<link id="link17" bandwidth="155Bps"/>
+	<link id="link18" bandwidth="155Bps"/>
+	<link id="link19" bandwidth="155Bps"/>
+	<link id="link20" bandwidth="155Bps"/>
+	<link id="link21" bandwidth="155Bps"/>
+	<link id="link22" bandwidth="622Bps"/>
+	<link id="link23" bandwidth="622Bps"/>
+	<link id="link24" bandwidth="155Bps"/>
+	<link id="link25" bandwidth="10KBps"/>
+	<link id="link26" bandwidth="2.5KBps"/>
+	<link id="link27" bandwidth="155Bps"/>
+	<link id="link28" bandwidth="2.5KBps"/>
+	<link id="link29" bandwidth="1KBps"/>
+	<link id="link30" bandwidth="10KBps"/>
+	<link id="link31" bandwidth="10KBps"/>
+	<link id="link32" bandwidth="155Bps"/>
+	<link id="link33" bandwidth="1KBps"/>
+	<link id="link34" bandwidth="155Bps"/>
+	<link id="link35" bandwidth="155Bps"/>
+	<link id="link36" bandwidth="155Bps"/>
+	<link id="link37" bandwidth="155Bps"/>
+	<link id="link38" bandwidth="155Bps"/>
+	<link id="link39" bandwidth="155Bps"/>
+	<link id="link40" bandwidth="1KBps"/>
+	<link id="link41" bandwidth="1KBps"/>
+	<link id="link42" bandwidth="10KBps"/>
+	<link id="link43" bandwidth="2.5KBps"/>
+	<link id="link44" bandwidth="10KBps"/>
+	<link id="link45" bandwidth="155Bps"/>
+	<link id="link46" bandwidth="155Bps"/>
+	<link id="link47" bandwidth="2.5KBps"/>
+	<link id="link48" bandwidth="155Bps"/>
+	<link id="link49" bandwidth="155Bps"/>
+	<link id="link50" bandwidth="10KBps"/>
+	<link id="link51" bandwidth="155Bps"/>
+	<link id="link52" bandwidth="10KBps"/>
+	<link id="link53" bandwidth="155Bps"/>
+	<link id="link54" bandwidth="155Bps"/>
+	<link id="link55" bandwidth="155Bps"/>
+	<link id="link56" bandwidth="155Bps"/>
+	<link id="link57" bandwidth="2.5KBps"/>
+	<link id="link58" bandwidth="1KBps"/>
+	<link id="link59" bandwidth="10KBps"/>
+	<link id="link60" bandwidth="2.5KBps"/>
+	<link id="link61" bandwidth="2.5KBps"/>
+	<link id="link62" bandwidth="155Bps"/>
+	<link id="link63" bandwidth="10KBps"/>
+	<link id="link64" bandwidth="10KBps"/>
+	<link id="link65" bandwidth="1KBps"/>
+	<link id="link66" bandwidth="155Bps"/>
+	<link id="link67" bandwidth="10KBps"/>
+	<link id="link68" bandwidth="10KBps"/>
+	<link id="link69" bandwidth="1KBps"/>
+	<link id="link70" bandwidth="10KBps"/>
+	<link id="link71" bandwidth="1KBps"/>
+	<link id="link72" bandwidth="10KBps"/>
+	<link id="link73" bandwidth="622Bps"/>
+	<link id="link74" bandwidth="1KBps"/>
+	<link id="link75" bandwidth="1KBps"/>
+	<link id="link76" bandwidth="1KBps"/>
+	<link id="link77" bandwidth="10KBps"/>
+	<link id="link78" bandwidth="155Bps"/>
+	<link id="link79" bandwidth="155Bps"/>
+	<link id="link80" bandwidth="155Bps"/>
+	<link id="link81" bandwidth="155Bps"/>
+	<link id="link82" bandwidth="155Bps"/>
+	<link id="link83" bandwidth="155Bps"/>
+	<link id="link84" bandwidth="155Bps"/>
+	<link id="link85" bandwidth="155Bps"/>
+	<link id="link86" bandwidth="155Bps"/>
+	<link id="link87" bandwidth="155Bps"/>
+	<link id="link88" bandwidth="155Bps"/>
+	<link id="link89" bandwidth="2.5KBps"/>
+	<link id="link90" bandwidth="10KBps"/>
+	<link id="link91" bandwidth="3KBps"/>
+	<link id="link92" bandwidth="3KBps"/>
+	<link id="link93" bandwidth="10KBps"/>
+	<link id="link94" bandwidth="10KBps"/>
+	<link id="link95" bandwidth="622Bps"/>
+	<link id="link96" bandwidth="622Bps"/>
+	<link id="link97" bandwidth="1KBps"/>
+	<link id="link98" bandwidth="3KBps"/>
+	<link id="link99" bandwidth="3KBps"/>
+	<link id="link100" bandwidth="10KBps"/>
+	<link id="link101" bandwidth="2.5KBps"/>
+	<link id="link102" bandwidth="155Bps"/>
+	<link id="link103" bandwidth="10KBps"/>
+	<link id="link104" bandwidth="10KBps"/>
+	<link id="link105" bandwidth="155Bps"/>
+	<link id="link106" bandwidth="155Bps"/>
+	<link id="link107" bandwidth="10KBps"/>
+	<link id="link108" bandwidth="10KBps"/>
+	<link id="link109" bandwidth="10KBps"/>
+	<link id="link110" bandwidth="155Bps"/>
+	<link id="link111" bandwidth="10KBps"/>
+	<link id="link112" bandwidth="10KBps"/>
+	<link id="link113" bandwidth="3KBps"/>
+	<link id="link114" bandwidth="155Bps"/>
+	<link id="link115" bandwidth="3KBps"/>
+	<link id="link116" bandwidth="10KBps"/>
+	<link id="link117" bandwidth="622Bps"/>
+	<link id="link118" bandwidth="155Bps"/>
+	<link id="link119" bandwidth="33Bps"/>
+	<link id="link120" bandwidth="1KBps"/>
+	<link id="link121" bandwidth="622Bps"/>
+	<link id="link122" bandwidth="155Bps"/>
+	<link id="link123" bandwidth="155Bps"/>
+	<link id="link124" bandwidth="155Bps"/>
+	<link id="link125" bandwidth="155Bps"/>
+	<link id="link126" bandwidth="622Bps"/>
 
 	<route src="0" dst="2">
 		<link_ctn id="link0"/>