[cig-commits] r14816 - in mc/3D/CitcomS/branches/cxx/CitcomS: Components/Advection_diffusion Components/Sphere Components/Stokes_solver Solver

[leif at geodynamics.org]

Author: leif
Date: 2009-04-29 13:47:56 -0700 (Wed, 29 Apr 2009)
New Revision: 14816

Modified:
   mc/3D/CitcomS/branches/cxx/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
   mc/3D/CitcomS/branches/cxx/CitcomS/Components/Sphere/Sphere.py
   mc/3D/CitcomS/branches/cxx/CitcomS/Components/Stokes_solver/Incompressible.py
   mc/3D/CitcomS/branches/cxx/CitcomS/Solver/Solver.py
Log:
Merged r14275:14351 from trunk.


Modified: mc/3D/CitcomS/branches/cxx/CitcomS/Components/Advection_diffusion/Advection_diffusion.py
===================================================================
--- mc/3D/CitcomS/branches/cxx/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2009-04-29 19:59:23 UTC (rev 14815)
+++ mc/3D/CitcomS/branches/cxx/CitcomS/Components/Advection_diffusion/Advection_diffusion.py	2009-04-29 20:47:56 UTC (rev 14816)
@@ -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/branches/cxx/CitcomS/Components/Sphere/Sphere.py
===================================================================
--- mc/3D/CitcomS/branches/cxx/CitcomS/Components/Sphere/Sphere.py	2009-04-29 19:59:23 UTC (rev 14815)
+++ mc/3D/CitcomS/branches/cxx/CitcomS/Components/Sphere/Sphere.py	2009-04-29 20:47:56 UTC (rev 14816)
@@ -31,13 +31,6 @@
 
 class Sphere(CitcomComponent):
 
-
-
-    def setup(self):
-        return
-
-
-
     def run(self):
         start_time = CPU_time()
         self.launch()
@@ -84,10 +77,10 @@
         nodex = pyre.inventory.int("nodex", default=9)
         nodey = pyre.inventory.int("nodey", default=9)
         nodez = pyre.inventory.int("nodez", default=9)
-        mgunitx = pyre.inventory.int("mgunitx", default=8)
-        mgunity = pyre.inventory.int("mgunity", default=8)
-        mgunitz = pyre.inventory.int("mgunitz", default=8)
-        levels = pyre.inventory.int("levels", default=1)
+        mgunitx = pyre.inventory.int("mgunitx", default=2)
+        mgunity = pyre.inventory.int("mgunity", default=2)
+        mgunitz = pyre.inventory.int("mgunitz", default=2)
+        levels = pyre.inventory.int("levels", default=3)
 
         radius_outer = pyre.inventory.float("radius_outer", default=1.0)
         radius_inner = pyre.inventory.float("radius_inner", default=0.55)

Modified: mc/3D/CitcomS/branches/cxx/CitcomS/Components/Stokes_solver/Incompressible.py
===================================================================
--- mc/3D/CitcomS/branches/cxx/CitcomS/Components/Stokes_solver/Incompressible.py	2009-04-29 19:59:23 UTC (rev 14815)
+++ mc/3D/CitcomS/branches/cxx/CitcomS/Components/Stokes_solver/Incompressible.py	2009-04-29 20:47:56 UTC (rev 14816)
@@ -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/branches/cxx/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/branches/cxx/CitcomS/Solver/Solver.py	2009-04-29 19:59:23 UTC (rev 14815)
+++ mc/3D/CitcomS/branches/cxx/CitcomS/Solver/Solver.py	2009-04-29 20:47:56 UTC (rev 14816)
@@ -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()