[cig-commits] r9013 - in short/3D/PyLith/trunk: libsrc libsrc/meshio modulesrc/meshio pylith pylith/meshio unittests/pytests/topology

[brad at geodynamics.org]

Author: brad
Date: 2008-01-14 11:40:35 -0800 (Mon, 14 Jan 2008)
New Revision: 9013

Modified:
   short/3D/PyLith/trunk/libsrc/Makefile.am
   short/3D/PyLith/trunk/libsrc/meshio/Makefile.am
   short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src
   short/3D/PyLith/trunk/pylith/Makefile.am
   short/3D/PyLith/trunk/pylith/meshio/__init__.py
   short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py
Log:
Switched Python unit test for distributing mesh from SolutionIO to OutputManager. Removed SolutionIO files from Makefiles.

Modified: short/3D/PyLith/trunk/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/Makefile.am	2008-01-14 19:23:22 UTC (rev 9012)
+++ short/3D/PyLith/trunk/libsrc/Makefile.am	2008-01-14 19:40:35 UTC (rev 9013)
@@ -83,8 +83,6 @@
 	meshio/PsetFile.cc \
 	meshio/PsetFileAscii.cc \
 	meshio/PsetFileBinary.cc \
-	meshio/SolutionIO.cc \
-	meshio/SolutionIOVTK.cc \
 	meshio/VertexFilter.cc \
 	topology/FieldsManager.cc \
 	topology/Distributor.cc \

Modified: short/3D/PyLith/trunk/libsrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/Makefile.am	2008-01-14 19:23:22 UTC (rev 9012)
+++ short/3D/PyLith/trunk/libsrc/meshio/Makefile.am	2008-01-14 19:40:35 UTC (rev 9013)
@@ -25,9 +25,6 @@
 	MeshIOLagrit.hh \
 	MeshIOLagrit.icc \
 	OutputManager.hh \
-	SolutionIO.hh \
-	SolutionIOVTK.hh \
-	SolutionIOVTK.icc \
 	VertexFilter.hh
 
 if ENABLE_CUBIT

Modified: short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src	2008-01-14 19:23:22 UTC (rev 9012)
+++ short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe.src	2008-01-14 19:40:35 UTC (rev 9013)
@@ -1223,7 +1223,6 @@
       cdef char** labels
       labels = NULL
       numFields = len(fields)
-      print "numFields",numFields
       if numFields > 0:
         names = <char**> malloc(numFields*sizeof(char*))
         labels = <char**> malloc(numFields*sizeof(char*))

Modified: short/3D/PyLith/trunk/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/pylith/Makefile.am	2008-01-14 19:23:22 UTC (rev 9012)
+++ short/3D/PyLith/trunk/pylith/Makefile.am	2008-01-14 19:40:35 UTC (rev 9013)
@@ -84,8 +84,6 @@
 	meshio/MeshIOLagrit.py \
 	meshio/OutputManager.py \
 	meshio/SingleOutput.py \
-	meshio/SolutionIO.py \
-	meshio/SolutionIOVTK.py \
 	meshio/VertexFilter.py \
 	problems/__init__.py \
 	problems/Explicit.py \

Modified: short/3D/PyLith/trunk/pylith/meshio/__init__.py
===================================================================
--- short/3D/PyLith/trunk/pylith/meshio/__init__.py	2008-01-14 19:23:22 UTC (rev 9012)
+++ short/3D/PyLith/trunk/pylith/meshio/__init__.py	2008-01-14 19:40:35 UTC (rev 9013)
@@ -23,8 +23,6 @@
            'MeshIOLagrit',
            'OutputManager',
            'SingleOutput',
-           'SolutionIO',
-           'SolutionIOVTK',
            'VertexFilter']
 
 

Modified: short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py	2008-01-14 19:23:22 UTC (rev 9012)
+++ short/3D/PyLith/trunk/unittests/pytests/topology/TestMeshGenSimple.py	2008-01-14 19:40:35 UTC (rev 9013)
@@ -41,17 +41,19 @@
     generator.setBoundary(generator.createCubeBoundary())
     mesh = generator.create()
 
-    from pylith.meshio.SolutionIOVTK import SolutionIOVTK
-    io = SolutionIOVTK()
+    from pylith.meshio.OutputManager import OutputManager
+    io = OutputManager()
     io._configure()
-    io.filename = 'mesh.vtk'
+    io.writer._configure()
+    io.writer.filename = 'mesh.vtk'
     from spatialdata.geocoords.CSCart import CSCart
     io.coordsys = CSCart()
     mesh.coordsys = CSCart()
+    io.initialize()
     io.open(mesh)
     from pyre.units.time import s
     t = 0.0*s
-    io.openTimeStep(0.0, 0, mesh)
+    io.openTimeStep(t, 0)
     io.closeTimeStep()
     io.close()
 
@@ -59,9 +61,9 @@
     distributor = Distributor()
     distributor.partitioner = "chaco"
     newMesh = distributor.distribute(mesh)
-    io.filename = 'newMesh.vtk'
+    io.writer.filename = 'newMesh.vtk'
     io.open(newMesh)
-    io.openTimeStep(0.0, 0, mesh)
+    io.openTimeStep(t, 0)
     io.closeTimeStep()
     io.close()
     return