A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cosmetics: rename a function, deprecate old name
[simgrid.git]
/
teshsuite
/
simdag
/
platforms
/
two_clusters_one_name.xml
diff --git
a/teshsuite/simdag/platforms/two_clusters_one_name.xml
b/teshsuite/simdag/platforms/two_clusters_one_name.xml
index
b22eee9
..
dc50aa1
100644
(file)
--- a/
teshsuite/simdag/platforms/two_clusters_one_name.xml
+++ b/
teshsuite/simdag/platforms/two_clusters_one_name.xml
@@
-1,31
+1,18
@@
<?xml version='1.0'?>
<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
<?xml version='1.0'?>
<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
- <AS id="AS0" routing="Full">
-
- <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu"
- radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
+<platform version="4.1">
+ <zone id="AS0" routing="Full">
+ <cluster id="bob_cluster" prefix="bob" suffix=".hamburger.edu" radical="0-1" speed="1Gf" bw="125MBps" lat="50us"
bb_bw="2.25GBps" bb_lat="500us"/>
bb_bw="2.25GBps" bb_lat="500us"/>
-
- <cluster id="bob_cluster_1" prefix="bob" suffix=".hamburger.edu"
- radical="2-3" speed="1Gf" bw="125MBps" lat="50us"
+
+ <cluster id="bob_cluster_1" prefix="bob" suffix=".hamburger.edu" radical="2-3" speed="1Gf" bw="125MBps" lat="50us"
bb_bw="2.25GBps" bb_lat="500us"/>
bb_bw="2.25GBps" bb_lat="500us"/>
-
+
<link id="backbone" bandwidth="1.25GBps" latency="500us"/>
<link id="backbone" bandwidth="1.25GBps" latency="500us"/>
-
- <ASroute src="bob_cluster"
- dst="bob_cluster_1"
- gw_src="bobbob_cluster_router.hamburger.edu"
+
+ <zoneRoute src="bob_cluster" dst="bob_cluster_1" gw_src="bobbob_cluster_router.hamburger.edu"
gw_dst="bobbob_cluster_1_router.hamburger.edu">
<link_ctn id="backbone"/>
gw_dst="bobbob_cluster_1_router.hamburger.edu">
<link_ctn id="backbone"/>
- </ASroute>
-
- <ASroute src="bob_cluster_1"
- dst="bob_cluster"
- gw_src="bobbob_cluster_1_router.hamburger.edu"
- gw_dst="bobbob_cluster_router.hamburger.edu">
- <link_ctn id="backbone"/>
- </ASroute>
-
- </AS>
+ </zoneRoute>
+ </zone>
</platform>
</platform>