[cig-commits] r5992 - short/3D/PyLith/trunk/modulesrc/feassemble

[brad at geodynamics.org]

Author: brad
Date: 2007-02-09 07:50:47 -0800 (Fri, 09 Feb 2007)
New Revision: 5992

Modified:
   short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
Log:
Fixed bug (IntegratorDynExplcit::initialize -> DynExplicitElasticity::setupMatProp).

Modified: short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src	2007-02-09 05:55:57 UTC (rev 5991)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src	2007-02-09 15:50:47 UTC (rev 5992)
@@ -343,22 +343,39 @@
     print "WARNING: IntegratorDynExplicit::integrateJacobian not implemented."
     return
 
-  def initialize(self, mesh, cs, db):
+# ----------------------------------------------------------------------
+cdef class DynExplicitElasticity(IntegratorDynExplicit):
+
+  def __init__(self):
     """
+    Constructor.
+    """
+    # create shim for constructor
+    #embed{ void* DynExplicitElasticity_constructor()
+    return (void*)(new pylith::feassemble::DynExplicitElasticity);
+    #}embed
+
+    IntegratorDynExplicit.__init__(self)
+    self.thisptr = DynExplicitElasticity_constructor()
+    self.handle = self._createHandle()
+    return
+
+  def setupMatProp(self, mesh, cs, db):
+    """
     Initialize integrator.
 
     @param mesh PETSc mesh
     @param cs Coordinate system associated with mesh vertices
     @param db Database of material properties
     """
-    # create shim for method 'initialize'
-    #embed{ void IntegratorDynExplicit_initialize(void* pObj, void* meshObj, void* csObj, void* dbObj)
+    # create shim for method 'setupMatProp'
+    #embed{ void DynExplicitElasticity_setupMatProp(void* pObj, void* meshObj, void* csObj, void* dbObj)
     ALE::Obj<ALE::Mesh>* mesh = (ALE::Obj<ALE::Mesh>*) meshObj;
     spatialdata::geocoords::CoordSys* cs =
       (spatialdata::geocoords::CoordSys*) csObj;
     spatialdata::spatialdb::SpatialDB* db =
       (spatialdata::spatialdb::SpatialDB*) dbObj;
-    ((pylith::feassemble::IntegratorDynExplicit*) pObj)->initialize(*mesh, cs, db);
+    ((pylith::feassemble::DynExplicitElasticity*) pObj)->setupMatProp(*mesh, cs, db);
     #}embed
 
     if not mesh.name == "pylith_topology_Mesh":
@@ -375,27 +392,9 @@
             "'spatialdata::spatialdb::SpatialDB'."
     cdef void* meshObj
     meshObj = <void*> PyCObject_AsVoidPtr(mesh)
-    IntegratorDynExplicit_initialize(self.thisptr, meshObj,
+    DynExplicitElasticity_setupMatProp(self.thisptr, meshObj,
                           ptrFromHandle(cs), ptrFromHandle(db))
     return
 
 
-# ----------------------------------------------------------------------
-cdef class DynExplicitElasticity(IntegratorDynExplicit):
-
-  def __init__(self):
-    """
-    Constructor.
-    """
-    # create shim for constructor
-    #embed{ void* DynExplicitElasticity_constructor()
-    return (void*)(new pylith::feassemble::DynExplicitElasticity);
-    #}embed
-
-    IntegratorDynExplicit.__init__(self)
-    self.thisptr = DynExplicitElasticity_constructor()
-    self.handle = self._createHandle()
-    return
-
-
 # End of file