[cig-commits] r7684 - in mc/3D/CitcomS/trunk/CitcomS: . Coupler
tan2 at geodynamics.org
tan2 at geodynamics.org
Tue Jul 17 15:48:51 PDT 2007
Author: tan2
Date: 2007-07-17 15:48:51 -0700 (Tue, 17 Jul 2007)
New Revision: 7684
Modified:
mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py
mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py
mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py
Log:
Fixed a few typos and attached MultiC_Coupler as the default factory for the ccoupler facility
Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py 2007-07-17 22:48:26 UTC (rev 7683)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/MultiC_Coupler.py 2007-07-17 22:48:51 UTC (rev 7684)
@@ -6,7 +6,7 @@
from ContainingCoupler import ContainingCoupler
-class MultiC_coupler(ContainingCoupler):
+class MultiC_Coupler(ContainingCoupler):
def __init__(self, name, facility):
@@ -26,9 +26,9 @@
# number of processors in the remote solver2
self.remoteSize2 = len(self.srcCommList2)
- # only one of remotePlus2 is sinkComm2
+ # only one of remotePlus2 is sinkComm2
self.sinkComm2 = solver.remotePlus2[self.communicator.rank]
-
+
# allocate space
self.remoteBdryList2 = range(self.remoteSize2)
self.sourceList2 = range(self.remoteSize2)
@@ -40,9 +40,11 @@
def createMesh(self):
# Create BoundedMesh objects.
+ from ExchangerLib import exchangeBoundedBox, createInterior, createEmptyBoundary
+
ContainingCoupler.createMesh(self)
-
+
# the bounding box of the mesh on remote solver2
self.remoteBBox2 = \
exchangeBoundedBox(self.globalBBox,
@@ -59,15 +61,15 @@
# which will be filled by a remote boundary obj.
for i in range(self.remoteSize2):
self.remoteBdryList2[i] = createEmptyBoundary()
-
-
+
+
return
def createSource(self):
ContainingCoupler.createSource(self)
-
+
# the source objects will send boundary conditions to remote sink2
from ExchangerLib import CitcomSource_create
for i, comm, b in zip(range(self.remoteSize2),
@@ -83,7 +85,7 @@
b,
self.myBBox2,
self.all_variables)
-
+
return
@@ -102,7 +104,7 @@
self.interior2)
return
-
+
def createBC(self):
ContainingCoupler.createBC(self)
@@ -115,7 +117,7 @@
self.outletList2[i] = Outlet.SVTOutlet(src, self.all_variables)
return
- def createII(self):
+ def createII(self):
ContainingCoupler.createII(self)
@@ -126,14 +128,14 @@
self.sink2,
self.all_variables)
return
-
+
# initTemperature
# restartTemperature
# modifyT
-
+
def postVSolverRun(self):
ContainingCoupler.postVSolverRun(self)
@@ -143,7 +145,7 @@
outlet.send()
return
-
+
def newStep(self):
ContainingCoupler.newStep(self)
@@ -154,7 +156,7 @@
self.inlet2.recv()
self.inlet2.impose()
return
-
+
def stableTimestep(self, dt):
#used by controller
@@ -205,20 +207,22 @@
while 1:
recv = self.exchangeSignal(sent)
- recv2= self.exchangeSignal2sent)
+ recv2= self.exchangeSignal2(sent)
- if done or (recv == END_SIMULATION_SIGNAL)
- or (recv == END_SIMULATION_SIGNAL):
+ if done or (recv == END_SIMULATION_SIGNAL) or \
+ (recv2 == END_SIMULATION_SIGNAL):
done = True
break
- elif (recv == KEEP_WAITING_SIGNAL)
- or(recv2 == KEEP_WAITING_SIGNAL):
+ elif (recv == KEEP_WAITING_SIGNAL) or \
+ (recv2 == KEEP_WAITING_SIGNAL):
pass
- elif (recv == NEW_STEP_SIGNAL)
- and (recv == NEW_STEP_SIGNAL):
+ elif (recv == NEW_STEP_SIGNAL) and \
+ (recv2 == NEW_STEP_SIGNAL):
+ sent = NEW_STEP_SIGNAL
if self.synchronized:
#print self.name, 'exchanging timestep =', steps
self.coupled_steps = self.exchangeSignal(steps)
+ self.coupled_steps2 = self.exchangeSignal2(steps)
#print self.name, 'exchanged timestep =', self.coupled_steps
break
else:
@@ -226,15 +230,11 @@
"Unexpected signal value, singnal = %d" % recv
return done
-
- class Inventory(ContainingCoupler.Inventory):
-
+
+
# version
-__id__ = "$Id:$"
+__id__ = "$Id$"
# End of file
-
-
-
Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py 2007-07-17 22:48:26 UTC (rev 7683)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py 2007-07-17 22:48:51 UTC (rev 7684)
@@ -37,6 +37,11 @@
return EmbeddedCoupler(name, facility)
+def multicontainingcoupler(name, facility):
+ from MultiC_Coupler import MultiC_Coupler
+ return MultiC_Coupler(name, facility)
+
+
# version
__id__ = "$Id$"
Modified: mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py 2007-07-17 22:48:26 UTC (rev 7683)
+++ mc/3D/CitcomS/trunk/CitcomS/MultiCoupledApp.py 2007-07-17 22:48:51 UTC (rev 7684)
@@ -152,30 +152,30 @@
args=("ccontroller","ccontroller"))
econtroller1 = pyre.inventory.facility(name="econtroller1",
factory=Controller.controller,
- args=("econtroller","econtroller"))
+ args=("econtroller1","econtroller1"))
econtroller2 = pyre.inventory.facility(name="econtroller2",
factory=Controller.controller,
- args=("econtroller","econtroller"))
+ args=("econtroller2","econtroller2"))
ccoupler = pyre.inventory.facility("ccoupler",
- factory=Coupler.containingcoupler,
+ factory=Coupler.multicontainingcoupler,
args=("ccoupler","ccoupler"))
ecoupler1 = pyre.inventory.facility("ecoupler1",
factory=Coupler.embeddedcoupler,
- args=("ecoupler","ecoupler"))
+ args=("ecoupler1","ecoupler1"))
ecoupler2 = pyre.inventory.facility("ecoupler2",
factory=Coupler.embeddedcoupler,
- args=("ecoupler","ecoupler"))
+ args=("ecoupler2","ecoupler2"))
csolver = pyre.inventory.facility("csolver",
- factory=Solver.coupledFullSolver,
+ factory=Solver.multicoupledRegionalSolver,
args=("csolver", "csolver"))
esolver1 = pyre.inventory.facility("esolver1",
- factory=Solver.coupledRegionalSolver,
- args=("esolver", "esolver"))
+ factory=Solver.multicoupledRegionalSolver,
+ args=("esolver1", "esolver1"))
esolver2 = pyre.inventory.facility("esolver2",
- factory=Solver.coupledRegionalSolver,
- args=("esolver", "esolver"))
+ factory=Solver.multicoupledRegionalSolver,
+ args=("esolver2", "esolver2"))
layout = pyre.inventory.facility("layout", factory=MultiLayout.MultiLayout,
args=("layout", "layout"))
@@ -187,4 +187,3 @@
__id__ = "$Id$"
# End of file
-
More information about the cig-commits
mailing list