[cig-commits] r18128 - in short/3D/PyLith/branches/v1.5-stable/libsrc: meshio problems topology utils

brad at geodynamics.org brad at geodynamics.org
Tue Mar 22 19:36:55 PDT 2011


Author: brad
Date: 2011-03-22 19:36:55 -0700 (Tue, 22 Mar 2011)
New Revision: 18128

Modified:
   short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/MeshIOSieve.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.hh
   short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.hh
   short/3D/PyLith/branches/v1.5-stable/libsrc/utils/sievetypes.hh
Log:
Updates for changes in filenames for petsc header files.

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc	2011-03-23 02:36:55 UTC (rev 18128)
@@ -18,7 +18,7 @@
 
 #include <portinfo>
 
-#include <petscmesh_viewers.hh> // USES VTKViewer
+#include <petscdmmesh_viewers.hh> // USES VTKViewer
 
 #include <cassert> // USES assert()
 #include <sstream> // USES std::ostringstream

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/MeshIOSieve.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/MeshIOSieve.cc	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/MeshIOSieve.cc	2011-03-23 02:36:55 UTC (rev 18128)
@@ -20,7 +20,7 @@
 
 #include "MeshIOSieve.hh" // implementation of class methods
 
-#include "petscmesh.hh"
+#include "petscdmmesh.hh"
 
 #include "MeshBuilder.hh" // USES MeshBuilder
 #include "pylith/topology/Mesh.hh" // USES Mesh

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc	2011-03-23 02:36:55 UTC (rev 18128)
@@ -32,7 +32,7 @@
 #define FIELD_SPLIT
 
 #if defined(FIELD_SPLIT)
-#include <petscmesh_solvers.hh> // USES constructFieldSplit()
+#include <petscdmmesh_solvers.hh> // USES constructFieldSplit()
 #endif
 
 // ----------------------------------------------------------------------

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc	2011-03-23 02:36:55 UTC (rev 18128)
@@ -676,7 +676,7 @@
     err = VecScatterDestroy(_scatter); _scatter = 0;
     CHECK_PETSC_ERROR(err);
   } // if
-  err = MeshCreateGlobalScatter(_mesh.sieveMesh(), _section, &_scatter);
+  err = DMMeshCreateGlobalScatter(_mesh.sieveMesh(), _section, &_scatter);
   CHECK_PETSC_ERROR(err);
 
   if (0 != _scatterVec) {

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.hh	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.hh	2011-03-23 02:36:55 UTC (rev 18128)
@@ -32,7 +32,7 @@
 #include "pylith/utils/arrayfwd.hh" // HASA int_array
 #include "pylith/utils/petscfwd.h" // HASA PetscVec
 
-#include <petscmesh.hh>
+#include <petscdmmesh.hh>
 
 // Field ----------------------------------------------------------------
 /** @brief Vector field over the vertices or cells of a finite-element

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc	2011-03-23 02:36:55 UTC (rev 18128)
@@ -43,7 +43,7 @@
   // dimension, otherwise use a block size of 1.
   const int blockFlag = (blockOkay) ? -1 : 1;
 
-  PetscErrorCode err = MeshCreateMatrix(sieveMesh, fieldSection,
+  PetscErrorCode err = DMMeshCreateMatrix(sieveMesh, fieldSection,
 					matrixType, &_matrix, blockFlag);
   CHECK_PETSC_ERROR_MSG(err, "Could not create PETSc sparse matrix "
 			"associated with system Jacobian.");
@@ -69,7 +69,7 @@
   // dimension, otherwise use a block size of 1.
   const int blockFlag = (blockOkay) ? -1 : 1;
 
-  PetscErrorCode err = MeshCreateMatrix(sieveMesh, fieldSection,
+  PetscErrorCode err = DMMeshCreateMatrix(sieveMesh, fieldSection,
           matrixType, &_matrix, blockFlag);
   CHECK_PETSC_ERROR_MSG(err, "Could not create PETSc sparse matrix "
       "associated with subsystem Jacobian.");

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.hh	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.hh	2011-03-23 02:36:55 UTC (rev 18128)
@@ -31,7 +31,7 @@
 
 #include "pylith/utils/petscfwd.h" // HOLDSA PetscMat
 
-#include <petscmesh.hh> // USES MPI_Comm
+#include <petscdmmesh.hh> // USES MPI_Comm
 
 #include <string> // USES std::string
 

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/utils/sievetypes.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/utils/sievetypes.hh	2011-03-23 01:11:31 UTC (rev 18127)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/utils/sievetypes.hh	2011-03-23 02:36:55 UTC (rev 18128)
@@ -25,7 +25,7 @@
 #if !defined(pylith_utils_sievetypes_hh)
 #define pylith_utils_sievetypes_hh
 
-#include <petscmesh.hh> // PETSc Mesh
+#include <petscdmmesh.hh> // PETSc Mesh
 
 namespace pylith {
 



More information about the CIG-COMMITS mailing list