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

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-08-24 13:08:59 -0700 (Thu, 24 Aug 2006)
New Revision: 4419

Modified:
   mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
   mc/3D/CitcomS/trunk/CitcomS/Layout.py
Log:
Renamed some attributes

Modified: mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py	2006-08-24 20:08:17 UTC (rev 4418)
+++ mc/3D/CitcomS/trunk/CitcomS/CoupledApp.py	2006-08-24 20:08:59 UTC (rev 4419)
@@ -62,20 +62,20 @@
 
     def findLayout(self, layout):
 
-        if layout.coarse:
+        if layout.comm1:
             self.controller = self.inventory.controller1
             self.solver = self.inventory.solver1
             self.coupler = self.inventory.coupler1
-            self.solverCommunicator = layout.coarse
-            self.myPlus = layout.coarsePlus
-            self.remotePlus = layout.finePlus
-        elif layout.fine:
+            self.solverCommunicator = layout.comm1
+            self.myPlus = layout.comm1Plus
+            self.remotePlus = layout.comm2Plus
+        elif layout.comm2:
             self.controller = self.inventory.controller2
             self.solver = self.inventory.solver2
             self.coupler = self.inventory.coupler2
-            self.solverCommunicator = layout.fine
-            self.myPlus = layout.finePlus
-            self.remotePlus = layout.coarsePlus
+            self.solverCommunicator = layout.comm2
+            self.myPlus = layout.comm2Plus
+            self.remotePlus = layout.comm1Plus
         else:
             import journal
             journal.warning(self.name).log("node '%d' is an orphan"

Modified: mc/3D/CitcomS/trunk/CitcomS/Layout.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Layout.py	2006-08-24 20:08:17 UTC (rev 4418)
+++ mc/3D/CitcomS/trunk/CitcomS/Layout.py	2006-08-24 20:08:59 UTC (rev 4419)
@@ -40,10 +40,10 @@
     def __init__(self, name, facility):
         Component.__init__(self, name, facility)
 
-        self.coarse = None
-        self.fine = None
-        self.coarsePlus = []
-        self.finePlus = []
+        self.comm1 = None
+        self.comm2 = None
+        self.comm1Plus = []
+        self.comm2Plus = []
 
         self.comm = None
         self.rank = 0
@@ -96,17 +96,19 @@
     def createCommunicators(self):
         world = self.comm
         myrank = world.rank
-        fineGroup = self.inventory.fine
-        coarseGroup = self.inventory.coarse
+        comm1Group = self.inventory.comm1
+        comm2Group = self.inventory.comm2
 
-        self.fine = world.include(fineGroup)
-        self.coarse = world.include(coarseGroup)
+        # communicator for solvers
+        self.comm1 = world.include(comm1Group)
+        self.comm2 = world.include(comm2Group)
 
-        for each in coarseGroup:
-            self.finePlus.append(world.include(fineGroup + [each]))
+        # communicator for inter-solver communication
+        for node in comm1Group:
+            self.comm2Plus.append(world.include(comm2Group + [node]))
 
-        for each in fineGroup:
-            self.coarsePlus.append(world.include(coarseGroup + [each]))
+        for node in comm2Group:
+            self.comm1Plus.append(world.include(comm1Group + [node]))
 
         return
 
@@ -116,12 +118,11 @@
 
         import pyre.inventory
 
+        comm1 = pyre.inventory.slice("comm1", default=range(12))
+        comm2 = pyre.inventory.slice("comm2", default=[12])
 
-        coarse = pyre.inventory.slice("coarse", default=range(12))
-        fine = pyre.inventory.slice("fine", default=[12])
 
 
-
 # version
 __id__ = "$Id$"