Make values more legible in XML files, and add a new file.

File machines1000.xml is basically the same as cluster100.xml, but
with smaller bandwidths (100 times smaller).

diff --git a/Makefile b/Makefile
index ce4b7c46f39e4132c433a26396ca42746fd15f26..a4ccf170f78059dc61db066acae0dfc79099e334 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ TARGETS := $(DEFAULT_TARGETS) \
 XML_FILES =                                            \
        Dep.xml  Plat.xml                               \
        platform.xml deployment.xml simple_async.xml    \
-       cluster1000.xml
+       cluster1000.xml machines1000.xml
 
 XML_DEV_FILES = $(XML_FILES:%.xml=%_dev.xml)
 

diff --git a/README b/README
index 7db502af0851b851318f0aa74c1064212e573d71..1cfa637ec3ed18036537b88478fb1d8d8ad58f30 100644 (file)
--- a/README
+++ b/README
@@ -125,6 +125,7 @@ Liste de fichiers
 
     Plat.xml
     cluster1000.xml
+    machines1000.xml
     platform.xml
 
 * fichiers de description de déploiement (tests)

diff --git a/cluster1000.xml b/cluster1000.xml
index 35374acbde3ed6e4c8a1a3b21e8cfd284e57b32f..182e3f819757d405cf8a38f0a8a91340a9d98c3e 100644 (file)
--- a/cluster1000.xml
+++ b/cluster1000.xml
@@ -3,8 +3,8 @@
 <platform version="3">
 <AS  id="AS0"  routing="Full">
   <cluster id="c" prefix="h-" suffix="" radical="100000-100999"
-        power="1000000000"
-        bw="125000000"     lat="5E-5"
-        bb_bw="2250000000" bb_lat="5E-4" bb_sharing_policy="FATPIPE"/>
+        power="1e9"
+        bw="1.25e8"     lat="5e-5"
+        bb_bw="2.25e9" bb_lat="5e-4" bb_sharing_policy="FATPIPE"/>
 </AS>
 </platform>

diff --git a/machines1000.xml b/machines1000.xml
new file mode 100644 (file)
index 0000000..4f64cb6
--- /dev/null
+++ b/machines1000.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0'?>
+<!DOCTYPE platform SYSTEM "simgrid.dtd">
+<platform version="3">
+<AS  id="AS0"  routing="Full">
+  <cluster id="c" prefix="h-" suffix="" radical="100000-100999"
+        power="1e9"
+        bw="1.25e6"     lat="5e-5"
+        bb_bw="2.25e7" bb_lat="5e-4" bb_sharing_policy="SHARED"/>
+</AS>
+</platform>