[cig-commits] r7683 - mc/3D/CitcomS/trunk/CitcomS/Solver

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-07-17 15:48:26 -0700 (Tue, 17 Jul 2007)
New Revision: 7683

Removed:
   mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_Solver.py
Modified:
   mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_FullSolver.py
   mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_RegionalSolver.py
   mc/3D/CitcomS/trunk/CitcomS/Solver/__init__.py
Log:
Simplified the MultiC_*Solver classes

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_FullSolver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_FullSolver.py	2007-07-17 00:45:42 UTC (rev 7682)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_FullSolver.py	2007-07-17 22:48:26 UTC (rev 7683)
@@ -1,28 +1,21 @@
 #!/usr/bin/env python
 
-#
-#not sure whether this will work...
-#
 
 from CoupledFullSolver import CoupledFullSolver
-from MultiC_Solver import MultiC_Solver
-import journal
 
+
 class MultiC_FullSolver(CoupledFullSolver):
 
-    def __init__(self, name, facility="solver"):
-        MultiC_Solver.__init__(self, name, facility)
-        CoupledFullSolver.__init__(self, name, facility)
-        return
 
-
     def initialize(self, application):
-        MultiC_Solver.initialize(self, name, facility)
-        CoupledFullSolver.initialize(self, name, facility)
+        self.myPlus2 = application.myPlus2
+        self.remotePlus2 = application.remotePlus2
+
+        CoupledFullSolver.initialize(self, application)
         return
-    
 
+
 # version
-__id__ = "Id"
+__id__ = "$Id$"
 
 # End of file

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_RegionalSolver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_RegionalSolver.py	2007-07-17 00:45:42 UTC (rev 7682)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_RegionalSolver.py	2007-07-17 22:48:26 UTC (rev 7683)
@@ -1,28 +1,21 @@
 #!/usr/bin/env python
 
-#
-#not sure whether this will work...
-#
 
 from CoupledRegionalSolver import CoupledRegionalSolver
-from MultiC_Solver import MultiC_Solver
-import journal
 
-class MultiC_FullSolver(CoupledRegionalSolver):
 
-    def __init__(self, name, facility="solver"):
-        MultiC_Solver.__init__(self, name, facility)
-        CoupledRegionalSolver.__init__(self, name, facility)
-        return
+class MultiC_RegionalSolver(CoupledRegionalSolver):
 
 
     def initialize(self, application):
-        MultiC_Solver.initialize(self, name, facility)
-        CoupledRegionalSolver.initialize(self, name, facility)
+        self.myPlus2 = application.myPlus2
+        self.remotePlus2 = application.remotePlus2
+
+        CoupledRegionalSolver.initialize(self, application)
         return
-    
 
+
 # version
-__id__ = "Id"
+__id__ = "$Id$"
 
 # End of file

Deleted: mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_Solver.py	2007-07-17 00:45:42 UTC (rev 7682)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/MultiC_Solver.py	2007-07-17 22:48:26 UTC (rev 7683)
@@ -1,30 +0,0 @@
-#!/usr/bin/env python
-
-#
-#some additional attributes used in MultiCoupled solvers
-#
-#can be think as a patch to CoupledSolver.py
-#
-
-
-import journal
-
-class MultiC_Solver:
-
-    def __init__(self, name, facility="solver"):
-        self.myPlus2 = []
-        self.remotePlus2 = []
-        return
-
-
-    def initialize(self, application):
-        self.myPlus2 = application.myPlus2
-        self.remotePlus2 = application.remotePlus2
-        return
-    
-
-# version
-__id__ = "Id"
-
-# End of file
-    

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/__init__.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/__init__.py	2007-07-17 00:45:42 UTC (rev 7682)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/__init__.py	2007-07-17 22:48:26 UTC (rev 7683)
@@ -40,6 +40,18 @@
 
 
 
+def multicoupledFullSolver(name, facility):
+    from MultiC_FullSolver import MultiC_FullSolver
+    return MultiC_FullSolver(name, facility)
+
+
+
+def multicoupledRegionalSolver(name, facility):
+    from MultiC_RegionalSolver import MultiC_RegionalSolver
+    return MultiC_RegionalSolver(name, facility)
+
+
+
 def fullSolver(name='full', facility='solver'):
     from FullSolver import FullSolver
     return FullSolver(name, facility)