[cig-commits] r4417 - mc/3D/CitcomS/trunk/CitcomS/Coupler

[tan2 at geodynamics.org]

Author: tan2
Date: 2006-08-24 12:40:45 -0700 (Thu, 24 Aug 2006)
New Revision: 4417

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Coupler/ContainingCoupler.py
   mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py
   mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py
   mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py
Log:
Changed the class names

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/ContainingCoupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/ContainingCoupler.py	2006-08-24 19:34:48 UTC (rev 4416)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/ContainingCoupler.py	2006-08-24 19:40:45 UTC (rev 4417)
@@ -26,13 +26,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 
-from Exchanger import Exchanger
+from Coupler import Coupler
 
-class CoarseGridExchanger(Exchanger):
+class ContainingCoupler(Coupler):
 
 
     def __init__(self, name, facility):
-        Exchanger.__init__(self, name, facility)
+        Coupler.__init__(self, name, facility)
 
         # exchanged information is non-dimensional
         self.inventory.dimensional = False
@@ -43,7 +43,7 @@
 
 
     def initialize(self, solver):
-        Exchanger.initialize(self, solver)
+        Coupler.initialize(self, solver)
 
 	# restart and use temperautre field of previous run?
 
@@ -209,7 +209,7 @@
 
 
 
-    class Inventory(Exchanger.Inventory):
+    class Inventory(Coupler.Inventory):
 
         import pyre.inventory as prop
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py	2006-08-24 19:34:48 UTC (rev 4416)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/Coupler.py	2006-08-24 19:40:45 UTC (rev 4417)
@@ -29,7 +29,7 @@
 from pyre.components.Component import Component
 
 
-class Exchanger(Component):
+class Coupler(Component):
 
 
     def __init__(self, name, facility):

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py	2006-08-24 19:34:48 UTC (rev 4416)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/EmbeddedCoupler.py	2006-08-24 19:40:45 UTC (rev 4417)
@@ -26,13 +26,13 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 
-from Exchanger import Exchanger
+from Coupler import Coupler
 
-class FineGridExchanger(Exchanger):
+class EmbeddedCoupler(Coupler):
 
 
     def __init__(self, name, facility):
-        Exchanger.__init__(self, name, facility)
+        Coupler.__init__(self, name, facility)
         self.cge_t = 0
         self.fge_t = 0
         self.toApplyBC = True
@@ -45,7 +45,7 @@
 
 
     def initialize(self, solver):
-        Exchanger.initialize(self, solver)
+        Coupler.initialize(self, solver)
 
 	# restart and use temperautre field of previous run?
         self.restart = solver.restart
@@ -244,7 +244,7 @@
 
 
 
-    class Inventory(Exchanger.Inventory):
+    class Inventory(Coupler.Inventory):
 
         import pyre.inventory as prop
 

Modified: mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py	2006-08-24 19:34:48 UTC (rev 4416)
+++ mc/3D/CitcomS/trunk/CitcomS/Coupler/__init__.py	2006-08-24 19:40:45 UTC (rev 4417)
@@ -27,20 +27,16 @@
 #
 
 
-def coarsegridexchanger(name='cge', facility='cge'):
-    from CoarseGridExchanger import CoarseGridExchanger
-    return CoarseGridExchanger(name, facility)
+def containingcoupler(name, facility):
+    from ContainingCoupler import ContainingCoupler
+    return ContainingCoupler(name, facility)
 
 
-def finegridexchanger(name='fge', facility='fge'):
-    from FineGridExchanger import FineGridExchanger
-    return FineGridExchanger(name, facility)
+def embeddedcoupler(name, facility):
+    from EmbeddedCoupler import EmbeddedCoupler
+    return EmbeddedCoupler(name, facility)
 
 
-def exchanger(name='exchanger', facility='exchanger'):
-    from Exchanger import Exchanger
-    return Exchanger
-
 # version
 __id__ = "$Id$"