[cig-commits] r15110 - mc/3D/CitcomS/trunk/tests

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-06-02 15:58:45 -0700 (Tue, 02 Jun 2009)
New Revision: 15110

Modified:
   mc/3D/CitcomS/trunk/tests/coupled.cfg
   mc/3D/CitcomS/trunk/tests/exchange.py
Log:
update to current coupler


Modified: mc/3D/CitcomS/trunk/tests/coupled.cfg
===================================================================
--- mc/3D/CitcomS/trunk/tests/coupled.cfg	2009-06-02 22:58:24 UTC (rev 15109)
+++ mc/3D/CitcomS/trunk/tests/coupled.cfg	2009-06-02 22:58:45 UTC (rev 15110)
@@ -19,25 +19,29 @@
 #CitcomS-GlobalBBox = on
 #Exchanger-exchangers-RemoteBBox = on
 #CitcomS-Boundary-BBox = on
-CitcomS-Boundary-X = on
-CitcomS-Boundary-nodeID = on
-CitcomS-Boundary-normal = on
+#CitcomS-Boundary-X = on
+#CitcomS-Boundary-nodeID = on
+#CitcomS-Boundary-normal = on
 #CitcomS-BoundaryVTInlet-V_constrained = on
-CitcomS-CitcomInterpolator-elem = on
+#CitcomS-CitcomInterpolator-elem = on
 #CitcomS-CitcomInterpolator-shape = on
 #CitcomS-CitcomInterpolator-etaAxes = on
 #CitcomS-CitcomInterpolator-inv-length-sq = on
 #CitcomS-Interior-BBox = on
-CitcomS-Interior-X = on
-CitcomS-Interior-nodeID = on
-CitcomS-SVTInlet-T = on
-CitcomS-SVTInlet-V = on
-CitcomS-SVTInlet-S = on
-CitcomS-SVTOutlet-T = on
-CitcomS-SVTOutlet-V = on 
-CitcomS-SVTOutlet-S = on
-Exchanger-Source-meshNode = on
-Exchanger-Sink-meshNode = on
+#CitcomS-Interior-X = on
+#CitcomS-Interior-nodeID = on
+CitcomS-PInterior-X = on
+#CitcomS-PInterior-nodeID = on
+#CitcomS-SVTInlet-T = on
+#CitcomS-SVTInlet-V = on
+#CitcomS-SVTInlet-S = on
+#CitcomS-SVTOutlet-T = on
+#CitcomS-SVTOutlet-V = on
+#CitcomS-SVTOutlet-S = on
+#CitcomS-PInlet-P = on
+#CitcomS-POutlet-P = on
+#Exchanger-Source-meshNode = on
+#Exchanger-Sink-meshNode = on
 #Exchanger-BoundedMesh-BBox_recv = on
 #Exchanger-BoundedMesh-X_recv = on
 #Exchanger-Boundary-normal_recv = on

Modified: mc/3D/CitcomS/trunk/tests/exchange.py
===================================================================
--- mc/3D/CitcomS/trunk/tests/exchange.py	2009-06-02 22:58:24 UTC (rev 15109)
+++ mc/3D/CitcomS/trunk/tests/exchange.py	2009-06-02 22:58:45 UTC (rev 15110)
@@ -135,7 +135,7 @@
 
         import pyre.inventory
 
-        import CitcomS.Components.Exchanger as Exchanger
+        import CitcomS.Coupler as Coupler
         import CitcomS.Controller as Controller
         import CitcomS.Layout as Layout
 
@@ -143,8 +143,10 @@
         controller = pyre.inventory.facility("controller", default=Controller.controller())
         layout = pyre.inventory.facility("layout", default=Layout.layout())
 
-        coarse = pyre.inventory.facility("coarse", default=Exchanger.coarsegridexchanger("coarse"))
-        fine = pyre.inventory.facility("fine", default=Exchanger.finegridexchanger("fine"))
+        coarse = pyre.inventory.facility("coarse", factory=Coupler.containingcoupler,
+                                         args=("coarse", "coarse"))
+        fine = pyre.inventory.facility("fine", factory=Coupler.embeddedcoupler,
+                                         args=("fine","fine"))