[cig-commits] r6866 - in short/3D/PyLith/trunk: modulesrc/topology unittests/pytests/topology

[brad at geodynamics.org]

Author: brad
Date: 2007-05-12 12:09:10 -0700 (Sat, 12 May 2007)
New Revision: 6866

Modified:
   short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src
   short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py
   short/3D/PyLith/trunk/unittests/pytests/topology/testdriver.py
Log:
Changed name of Partitioner to Distributor. Fixed bugs in MeshGenSimple. Modules return module objects, need to enclose within normal Python objects.

Modified: short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src	2007-05-12 18:09:09 UTC (rev 6865)
+++ short/3D/PyLith/trunk/modulesrc/topology/topology.pyxe.src	2007-05-12 19:09:10 UTC (rev 6866)
@@ -368,14 +368,14 @@
 
 
 # ----------------------------------------------------------------------
-cdef class Partitioner:
+cdef class Distributor:
 
   def distribute(self, mesh, partitioner):
     """
     Distribute a mesh.
     """
     # create shim for method 'distribute'
-    #embed{ void Partitioner_distribute(void* newMeshVptr, void* meshVptr, char *partitioner)
+    #embed{ void Distributor_distribute(void* newMeshVptr, void* meshVptr, char *partitioner)
     try {
       assert(0 != meshVptr);
       assert(0 != newMeshVptr);
@@ -402,7 +402,7 @@
       raise TypeError, \
             "Argument must be extension module type 'Mesh'."
     newMesh = Mesh()
-    Partitioner_distribute(ptrFromHandle(newMesh), ptrFromHandle(mesh),
+    Distributor_distribute(ptrFromHandle(newMesh), ptrFromHandle(mesh),
                            partitioner)
     return newMesh
 

Modified: short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py	2007-05-12 18:09:09 UTC (rev 6865)
+++ short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py	2007-05-12 19:09:10 UTC (rev 6866)
@@ -50,9 +50,9 @@
     #io.writeTopology(mesh)
     #io.close()
 
-    #from pylith.topology.Partitioner import Partitioner
-    #partitioner = Partitioner()
-    #newMesh = partitioner.distribute(mesh)
+    #from pylith.topology.Distributor import Distributor
+    #distributor = Distributor()
+    #newMesh = distributor.distribute(mesh)
     #io.filename = 'newMesh.vtk'
     #io.open(newMesh)
     #io.writeTopology(newMesh)

Modified: short/3D/PyLith/trunk/unittests/pytests/topology/testdriver.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/topology/testdriver.py	2007-05-12 18:09:09 UTC (rev 6865)
+++ short/3D/PyLith/trunk/unittests/pytests/topology/testdriver.py	2007-05-12 19:09:10 UTC (rev 6866)
@@ -39,7 +39,6 @@
     """
     from pylith.utils.PetscManager import PetscManager
     manager = PetscManager()
-    manager.options.append(('start_in_debugger', '1'))
     manager.initialize()
     unittest.TextTestRunner(verbosity=2).run(self._suite())
     manager.finalize()