[cig-commits] r12059 - short/3D/PyLith/trunk/pylith/problems

[brad at geodynamics.org]

Author: brad
Date: 2008-05-29 21:41:42 -0700 (Thu, 29 May 2008)
New Revision: 12059

Modified:
   short/3D/PyLith/trunk/pylith/problems/Formulation.py
Log:
Fixed a couple gravity field setup bugs in Formulation.py.

Modified: short/3D/PyLith/trunk/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/trunk/pylith/problems/Formulation.py	2008-05-29 20:13:34 UTC (rev 12058)
+++ short/3D/PyLith/trunk/pylith/problems/Formulation.py	2008-05-30 04:41:42 UTC (rev 12059)
@@ -63,7 +63,7 @@
     import pyre.inventory
 
     useGravity = pyre.inventory.bool("use_gravity", default=False)
-    useGravity.meta['tip'] = "Use gravitational acceleration for problem."
+    useGravity.meta['tip'] = "Use gravitational body forces in problem."
     
     from pylith.solver.SolverLinear import SolverLinear
     solver = pyre.inventory.facility("solver", family="solver",
@@ -161,13 +161,13 @@
     self.fields = FieldsManager(self.mesh)
     self._debug.log(resourceUsageString())
 
-    self._info.log("Initializing gravity field.")
-    from spatialdata.spatialdb.GravityField import GravityField
-    self.gravityField.initialize()
+    if self.gravityField != None:
+      self._info.log("Initializing gravity field.")
+      self.gravityField.initialize()
 
     self._info.log("Initializing integrators.")
     for integrator in self.integrators:
-      integrator.gravityField(self.gravityField)
+      integrator.gravityField = self.gravityField
       integrator.initialize(totalTime, numTimeSteps)
     self._debug.log(resourceUsageString())
 
@@ -285,7 +285,7 @@
     Component._configure(self)
     self.solver = self.inventory.solver
     self.output = self.inventory.output
-    if (self.useGravity):
+    if (self.inventory.useGravity):
       self.gravityField = self.inventory.gravityField
     else:
       self.gravityField = None