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

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-03-19 16:25:14 -0700 (Mon, 19 Mar 2007)
New Revision: 6300

Modified:
   mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
Log:
Advect the tracers right after temperature advection, before solving velocity

Modified: mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py
===================================================================
--- mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2007-03-19 23:08:40 UTC (rev 6299)
+++ mc/3D/CitcomS/trunk/CitcomS/Solver/Solver.py	2007-03-19 23:25:14 UTC (rev 6300)
@@ -108,7 +108,7 @@
         # Write controller inventory to pid file
         if stream:
             print >> stream, "[CitcomS.controller]"
-            print >> stream, ("monitoringFrequency=%d" % 
+            print >> stream, ("monitoringFrequency=%d" %
                 application.controller.inventory.monitoringFrequency)
             print >> stream
 
@@ -157,14 +157,14 @@
 
 
 
-    def solveTemperature(self, dt):
+    def advectTemperature(self, dt):
         tsolver = self.inventory.tsolver
         tsolver.run(dt)
         return
 
 
 
-    def solveAdditional(self):
+    def advectTracers(self):
         self.inventory.tracer.run()
         return
 
@@ -183,9 +183,9 @@
 
 
     def advance(self, dt):
-        self.solveTemperature(dt)
+        self.advectTemperature(dt)
+        self.advectTracers()
         self.solveVelocities()
-        self.solveAdditional()
         return