[cig-commits] r14350 - in mc/3D/CitcomS/trunk/CitcomS: Components/Advection_diffusion Components/Sphere Components/Stokes_solver Solver

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-03-16 15:43:37 -0700 (Mon, 16 Mar 2009)
New Revision: 14350

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
   mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
   mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
   mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
Log:
Make the initialization step in pyre conforms to C version. This fixs a bug in r13270.


Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2009-03-16 22:20:28 UTC (rev 14349)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2009-03-16 22:43:37 UTC (rev 14350)
@@ -51,7 +51,8 @@
 
 
 
-    def setup(self):
+    def initialize(self, all_variables):
+        CitcomComponent.initialize(self, all_variables)
         from CitcomSLib import set_convection_defaults
         set_convection_defaults(self.all_variables)
 	return

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py	2009-03-16 22:20:28 UTC (rev 14349)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Sphere/Sphere.py	2009-03-16 22:43:37 UTC (rev 14350)
@@ -31,13 +31,6 @@
 
 class Sphere(CitcomComponent):
 
-
-
-    def setup(self):
-        return
-
-
-
     def run(self):
         start_time = CPU_time()
         self.launch()

Modified: mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py	2009-03-16 22:20:28 UTC (rev 14349)
+++ mc/3D/CitcomS/trunk/CitcomS/Components/Stokes_solver/Incompressible.py	2009-03-16 22:43:37 UTC (rev 14350)
@@ -45,8 +45,8 @@
 	return
 
 
-
-    def setup(self):
+    def initialize(self, all_variables):
+        CitcomComponent.initialize(self, all_variables)
         from CitcomSLib import set_cg_defaults, set_mg_defaults, set_mg_el_defaults
         if self.inventory.Solver == "cgrad":
             set_cg_defaults(self.all_variables)

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2009-03-16 22:20:28 UTC (rev 14349)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2009-03-16 22:43:37 UTC (rev 14350)
@@ -144,13 +144,8 @@
 
     def _setup(self):
         mesher = self.inventory.mesher
-        mesher.setup()
-
         vsolver = self.inventory.vsolver
-        vsolver.setup()
-
         tsolver = self.inventory.tsolver
-        tsolver.setup()
 
         # create mesh
         mesher.run()