Merge from mergeto_trunk_22Aug12

[samples/dsccode.git] / resources / calcium4.xml

diff --git a/resources/calcium4.xml b/resources/calcium4.xml
index 452834b4fa858ca086679fe1f8e5c6e62213d922..ff02240ec97329b6d3dc5184dbe8cea4a4f2eeb2 100644 (file)
--- a/resources/calcium4.xml
+++ b/resources/calcium4.xml
@@ -1,13 +1,11 @@
 <proc>
 
     <!-- types -->
-    <objref name="CALCIUM_integer"/>
-    <objref name="CALCIUM_real"/>
     <container name="A">
       <property name="hostname" value="localhost"/>
     </container>
     <container name="B">
-      <property name="hostname" value="localhost"/>
+      <property name="hostname" value="localhost" />
     </container>
     <container name="C">
       <property name="hostname" value="localhost"/>
@@ -112,6 +110,7 @@
         <instream name="puissa" type="CALCIUM_real"/>
         <instream name="text" type="CALCIUM_real"/>
         <instream name="rext" type="CALCIUM_real"/>
+        <instream name="topo" type="CALCIUM_integer"/>
         <outstream name="tparoi" type="CALCIUM_real"/>
         <outstream name="rparoi" type="CALCIUM_real"/>
         <outstream name="temperature" type="CALCIUM_real"/>
@@ -122,6 +121,7 @@
         <inport name="dt" type="double"/>
         <instream name="temperature" type="CALCIUM_real"/>
         <outstream name="puissance" type="CALCIUM_real"/>
+        <outstream name="topo" type="CALCIUM_integer"/>
       </service>
       <service name="int1" >
         <node>a.int4</node>
@@ -141,7 +141,9 @@
         <method>trun</method>
         <load container="F"/>
         <instream name="tparoit" type="CALCIUM_real"/>
+        <instream name="topo" type="CALCIUM_integer"/>
         <outstream name="tpart" type="CALCIUM_real"/>
+        <outstream name="stopo" type="CALCIUM_integer"/>
       </service>
       <stream>
         <fromnode>canal</fromnode> <fromport>rfluide</fromport>
@@ -167,6 +169,7 @@
         <fromnode>int1</fromnode> <fromport>tpart</fromport>
         <tonode>canal</tonode> <toport>tparoi</toport>
         <property name="StorageLevel" value="10"/>
+        <property name="DateCalSchem" value="ALPHA_SCHEM"/>
       </stream>
       <stream>
         <fromnode>crayon</fromnode> <fromport>temperature</fromport>
@@ -188,6 +191,15 @@
         <tonode>crayon</tonode> <toport>puissa</toport>
         <property name="StorageLevel" value="10"/>
       </stream>
+
+      <stream>
+        <fromnode>comb</fromnode> <fromport>topo</fromport>
+        <tonode>int3</tonode> <toport>topo</toport>
+      </stream>
+      <stream>
+        <fromnode>int3</fromnode> <fromport>stopo</fromport>
+        <tonode>crayon</tonode> <toport>topo</toport>
+      </stream>
     </bloc>
 
     <!-- control -->