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

[knepley at geodynamics.org]

Author: knepley
Date: 2012-03-21 21:17:38 -0700 (Wed, 21 Mar 2012)
New Revision: 19845

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc
   short/3D/PyLith/trunk/libsrc/pylith/topology/Field.hh
   short/3D/PyLith/trunk/libsrc/pylith/topology/Mesh.hh
Log:
Turned on redundant point input, added empty objects for new mesh


Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc	2012-03-22 01:34:38 UTC (rev 19844)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/OutputSolnPoints.cc	2012-03-22 04:17:38 UTC (rev 19845)
@@ -127,12 +127,8 @@
   err = DMMeshInterpolationSetDim(dm, spaceDim, _interpolator);CHECK_PETSC_ERROR(err);
 
   err = DMMeshInterpolationAddPoints(dm, numPoints, (PetscReal*)&pointsNondim[0], _interpolator);CHECK_PETSC_ERROR(err);
-  const bool pointsAllProcs = true;
-#if 0 // WAITING FOR MATT TO IMPLEMENT
+  const PetscBool pointsAllProcs = PETSC_TRUE;
   err = DMMeshInterpolationSetUp(dm, _interpolator, pointsAllProcs);CHECK_PETSC_ERROR(err);
-#else
-  err = DMMeshInterpolationSetUp(dm, _interpolator);CHECK_PETSC_ERROR(err);
-#endif
   err = DMDestroy(&dm);CHECK_PETSC_ERROR(err);
 
   // Create mesh corresponding to points.

Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/Field.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/Field.hh	2012-03-22 01:34:38 UTC (rev 19844)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/Field.hh	2012-03-22 04:17:38 UTC (rev 19845)
@@ -414,6 +414,8 @@
   Metadata _metadata;
   const mesh_type& _mesh; ///< Mesh associated with section.
   ALE::Obj<section_type> _section; ///< Real section with data.
+  PetscSection _newSection;
+  Vec          _newLocalVec;
   scatter_map_type _scatters; ///< Collection of scatters.
 
 

Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/Mesh.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/Mesh.hh	2012-03-22 01:34:38 UTC (rev 19844)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/Mesh.hh	2012-03-22 04:17:38 UTC (rev 19845)
@@ -197,6 +197,7 @@
 private :
 
   ALE::Obj<SieveMesh> _mesh; ///< Sieve mesh.
+  DM _newMesh;
   spatialdata::geocoords::CoordSys* _coordsys; ///< Coordinate system.
   MPI_Comm _comm; ///< MPI communicator for mesh.
   bool _debug; ///< Debugging flag for mesh.