[cig-commits] r19109 - in short/3D/PyLith/trunk/libsrc/pylith: . meshio

[brad at geodynamics.org]

Author: brad
Date: 2011-10-21 09:27:16 -0700 (Fri, 21 Oct 2011)
New Revision: 19109

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/Makefile.am
   short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc
Log:
Comment out nonfunctional DM stuff.

Modified: short/3D/PyLith/trunk/libsrc/pylith/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/Makefile.am	2011-10-21 04:56:37 UTC (rev 19108)
+++ short/3D/PyLith/trunk/libsrc/pylith/Makefile.am	2011-10-21 16:27:16 UTC (rev 19109)
@@ -133,6 +133,7 @@
 	meshio/PsetFileAscii.cc \
 	meshio/PsetFileBinary.cc \
 	meshio/OutputSolnSubset.cc \
+	meshio/OutputSolnPoints.cc \
 	meshio/UCDFaultFile.cc \
 	problems/Formulation.cc \
 	problems/Explicit.cc \
@@ -153,7 +154,6 @@
 	utils/EventLogger.cc \
 	utils/TestArray.cc
 
-#meshio/OutputSolnPoints.cc 
 
 # TEMPORARY
 libpylith_la_SOURCES += \

Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc	2011-10-21 04:56:37 UTC (rev 19108)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc	2011-10-21 16:27:16 UTC (rev 19109)
@@ -52,18 +52,15 @@
 { // deallocate
   OutputManager<topology::Mesh, topology::Field<topology::Mesh> >::deallocate();
 
-
-  err = DMMeshCreateGlobalScatter(sieveMesh, _section, order, false, 
-				  &sinfo.scatter); 
-
-
+#if 0 // :MATT: Need DM wrapper for mesh
   if (_interpolator) {
     assert(_mesh);
     const ALE::Obj<SieveMesh>& sieveMesh = _mesh->sieveMesh();
     PetscErrorCode err = 
       DMMeshInterpolationDestroy(sieveMesh, &_interpolator);
-    PETSC_CHECK_ERROR(err);
+    CHECK_PETSC_ERROR(err);
   } // if
+#endif
 
   delete _mesh; _mesh = 0;
   delete _pointsMesh; _pointsMesh = 0;
@@ -99,9 +96,11 @@
   assert(_pointsMesh);
 
   scalar_array pointsArray(points, numPoints*spaceDim);
-  int_array cells;
-  const int numCells = 0;
-  const int numCorners = 0;
+  int_array cells(numPoints);
+  for (int i=0; i < numPoints; ++i)
+    cells[i] = i;
+  const int numCells = numPoints;
+  const int numCorners = 1;
   const bool interpolate = false;
   MeshBuilder::buildMesh(_pointsMesh,
 			 &pointsArray, numPoints, spaceDim,
@@ -109,6 +108,7 @@
 			 interpolate);
   _pointsMesh->coordsys(_mesh->coordsys());
 
+#if 0 // :MATT: Need DM wrapper for mesh
   // Setup interpolator object
   PetscErrorCode err = 0;
 
@@ -127,7 +127,7 @@
   
   err = DMMeshInterpolationSetUp(_mesh->sieveMesh(), _interpolator);
   CHECK_PETSC_ERROR(err);
-
+#endif
 } // createPointsMesh
 
 
@@ -176,6 +176,7 @@
   const ALE::Obj<SieveMesh>& sieveMesh = _mesh->sieveMesh();
   assert(!sieveMesh.isNull());
 
+#if 0 // :MATT: Need DM wrapper for mesh
   PetscErrorCode err = 0;
   
   err = DMMeshInterpolationSetDof(sieveMesh, fiberDim, _interpolator);
@@ -183,7 +184,8 @@
   
   err = DMMeshInterpolationEvaluate(sieveMesh, field.section(), fieldInterpVec,
 				    _interpolator); CHECK_PETSC_ERROR(err);
-  
+#endif  
+
   OutputManager<topology::Mesh, topology::Field<topology::Mesh> >::appendVertexField(t, fieldInterp, mesh);
 } // appendVertexField