[cig-commits] r7603 - mc/3D/CitcomS/trunk/CitcomS

[hlin at geodynamics.org]

Author: hlin
Date: 2007-07-05 15:36:06 -0700 (Thu, 05 Jul 2007)
New Revision: 7603

Modified:
   mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py
Log:


Modified: mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py	2007-07-05 20:49:14 UTC (rev 7602)
+++ mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py	2007-07-05 22:36:06 UTC (rev 7603)
@@ -74,9 +74,9 @@
   
         elif layout.ecomm1:
             # This process belongs to the embedded solver
-            self.controller = self.inventory.econtroller
-            self.solver = self.inventory.esolver
-            self.coupler = self.inventory.ecoupler
+            self.controller = self.inventory.econtroller1
+            self.solver = self.inventory.esolver1
+            self.coupler = self.inventory.ecoupler1
             self.solverCommunicator = layout.ecomm1
             #self.myPlus = layout.ecommPlus
             #self.remotePlus = layout.ccommPlus
@@ -84,9 +84,9 @@
 
         elif layout.ecomm2:
             # This process belongs to the embedded solver
-            self.controller = self.inventory.econtroller
-            self.solver = self.inventory.esolver
-            self.coupler = self.inventory.ecoupler
+            self.controller = self.inventory.econtroller2
+            self.solver = self.inventory.esolver2
+            self.coupler = self.inventory.ecoupler2
             self.solverCommunicator = layout.ecomm2
             #self.myPlus = layout.ecommPlus
             #self.remotePlus = layout.ccommPlus
@@ -119,22 +119,33 @@
         ccontroller = pyre.inventory.facility(name="ccontroller",
                                               factory=Controller.controller,
                                               args=("ccontroller","ccontroller"))
-        econtroller = pyre.inventory.facility(name="econtroller",
+        econtroller1 = pyre.inventory.facility(name="econtroller1",
                                               factory=Controller.controller,
                                               args=("econtroller","econtroller"))
+        econtroller2 = pyre.inventory.facility(name="econtroller2",
+                                              factory=Controller.controller,
+                                              args=("econtroller","econtroller"))
+
+
         ccoupler = pyre.inventory.facility("ccoupler",
                                            factory=Coupler.containingcoupler,
                                            args=("ccoupler","ccoupler"))
-        ecoupler = pyre.inventory.facility("ecoupler",
+        ecoupler1 = pyre.inventory.facility("ecoupler1",
                                            factory=Coupler.embeddedcoupler,
                                            args=("ecoupler","ecoupler"))
+        ecoupler2 = pyre.inventory.facility("ecoupler2",
+                                           factory=Coupler.embeddedcoupler,
+                                           args=("ecoupler","ecoupler"))
 
         csolver = pyre.inventory.facility("csolver",
                                           factory=Solver.coupledFullSolver,
                                           args=("csolver", "csolver"))
-        esolver = pyre.inventory.facility("esolver",
+        esolver1 = pyre.inventory.facility("esolver1",
                                        factory=Solver.coupledRegionalSolver,
                                        args=("esolver", "esolver"))
+        esolver2 = pyre.inventory.facility("esolver2",
+                                       factory=Solver.coupledRegionalSolver,
+                                       args=("esolver", "esolver"))
 
         layout = pyre.inventory.facility("layout", factory=Layout.Layout,
                                          args=("layout", "layout"))