[cig-commits] r18263 - in short/3D/PyLith/branches/v1.5-stable: libsrc/faults libsrc/meshio libsrc/problems libsrc/topology unittests/libtests/bc unittests/libtests/faults unittests/libtests/feassemble
brad at geodynamics.org
brad at geodynamics.org
Thu Apr 21 08:52:45 PDT 2011
Author: brad
Date: 2011-04-21 08:52:45 -0700 (Thu, 21 Apr 2011)
New Revision: 18263
Modified:
short/3D/PyLith/branches/v1.5-stable/libsrc/faults/FaultCohesiveDyn.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverNonlinear.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc
short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestAbsorbingDampers.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
Log:
Propagate PETSc changes (XXXDestroy).
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/faults/FaultCohesiveDyn.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/faults/FaultCohesiveDyn.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -84,7 +84,7 @@
delete _jacobian; _jacobian = 0;
if (0 != _ksp) {
- PetscErrorCode err = KSPDestroy(_ksp); _ksp = 0;
+ PetscErrorCode err = KSPDestroy(&_ksp); _ksp = 0;
CHECK_PETSC_ERROR(err);
} // if
} // deallocate
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/meshio/DataWriterVTK.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -68,7 +68,7 @@
pylith::meshio::DataWriterVTK<mesh_type, field_type>::deallocate(void)
{ // deallocate
if (0 != _viewer)
- PetscViewerDestroy(_viewer);
+ PetscViewerDestroy(&_viewer);
_viewer = 0;
} // deallocate
@@ -165,7 +165,7 @@
void
pylith::meshio::DataWriterVTK<mesh_type,field_type>::closeTimeStep(void)
{ // closeTimeStep
- PetscViewerDestroy(_viewer); _viewer = 0;
+ PetscViewerDestroy(&_viewer); _viewer = 0;
_wroteVertexHeader = false;
_wroteCellHeader = false;
} // closeTimeStep
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/problems/Solver.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -114,7 +114,7 @@
assert(!lagrangeGlobalOrder.isNull());
if (0 != *precondMatrix) {
- err = MatDestroy(*precondMatrix); *precondMatrix = 0;
+ err = MatDestroy(precondMatrix); *precondMatrix = 0;
CHECK_PETSC_ERROR(err);
} // if
PetscInt nrows = lagrangeGlobalOrder->getLocalSize();
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -56,12 +56,12 @@
Solver::deallocate();
if (0 != _ksp) {
- PetscErrorCode err = KSPDestroy(_ksp); _ksp = 0;
+ PetscErrorCode err = KSPDestroy(&_ksp); _ksp = 0;
CHECK_PETSC_ERROR(err);
} // if
if (0 != _precondMatrix) {
- PetscErrorCode err = MatDestroy(_precondMatrix); _precondMatrix = 0;
+ PetscErrorCode err = MatDestroy(&_precondMatrix); _precondMatrix = 0;
CHECK_PETSC_ERROR(err);
} // if
} // deallocate
@@ -81,7 +81,7 @@
PetscErrorCode err = 0;
if (0 != _ksp) {
- err = KSPDestroy(_ksp); _ksp = 0;
+ err = KSPDestroy(&_ksp); _ksp = 0;
CHECK_PETSC_ERROR(err);
} // if
err = KSPCreate(fields.mesh().comm(), &_ksp); CHECK_PETSC_ERROR(err);
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverNonlinear.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverNonlinear.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverNonlinear.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -79,7 +79,7 @@
Solver::deallocate();
if (0 != _snes) {
- PetscErrorCode err = SNESDestroy(_snes); _snes = 0;
+ PetscErrorCode err = SNESDestroy(&_snes); _snes = 0;
CHECK_PETSC_ERROR(err);
} // if
} // deallocate
@@ -99,7 +99,7 @@
PetscErrorCode err = 0;
if (0 != _snes) {
- err = SNESDestroy(_snes); _snes = 0;
+ err = SNESDestroy(&_snes); _snes = 0;
CHECK_PETSC_ERROR(err);
} // if
err = SNESCreate(fields.mesh().comm(), &_snes); CHECK_PETSC_ERROR(err);
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Field.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -61,17 +61,17 @@
{ // deallocate
PetscErrorCode err = 0;
if (0 != _vector) {
- err = VecDestroy(_vector); _vector = 0;
+ err = VecDestroy(&_vector); _vector = 0;
CHECK_PETSC_ERROR(err);
} // if
if (0 != _scatter) {
- err = VecScatterDestroy(_scatter); _scatter = 0;
+ err = VecScatterDestroy(&_scatter); _scatter = 0;
CHECK_PETSC_ERROR(err);
} // if
if (0 != _scatterVec) {
- err = VecDestroy(_scatterVec); _scatterVec = 0;
+ err = VecDestroy(&_scatterVec); _scatterVec = 0;
CHECK_PETSC_ERROR(err);
} // if
} // deallocate
@@ -642,7 +642,7 @@
PetscErrorCode err = 0;
if (0 != _vector) {
- err = VecDestroy(_vector); _vector = 0;
+ err = VecDestroy(&_vector); _vector = 0;
CHECK_PETSC_ERROR(err);
} // if
ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
@@ -678,14 +678,14 @@
PetscErrorCode err = 0;
if (0 != _scatter) {
- err = VecScatterDestroy(_scatter); _scatter = 0;
+ err = VecScatterDestroy(&_scatter); _scatter = 0;
CHECK_PETSC_ERROR(err);
} // if
err = DMMeshCreateGlobalScatter(_mesh.sieveMesh(), _section, &_scatter);
CHECK_PETSC_ERROR(err);
if (0 != _scatterVec) {
- err = VecDestroy(_scatterVec); _scatterVec = 0;
+ err = VecDestroy(&_scatterVec); _scatterVec = 0;
CHECK_PETSC_ERROR(err);
} // if
Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Jacobian.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -91,7 +91,7 @@
pylith::topology::Jacobian::deallocate(void)
{ // deallocate
if (0 != _matrix) {
- PetscErrorCode err = MatDestroy(_matrix); _matrix = 0;
+ PetscErrorCode err = MatDestroy(&_matrix); _matrix = 0;
CHECK_PETSC_ERROR(err);
} // if
} // deallocate
@@ -175,7 +175,7 @@
CHECK_PETSC_ERROR(err);
err = MatView(_matrix, viewer); CHECK_PETSC_ERROR(err);
- err = PetscViewerDestroy(viewer); CHECK_PETSC_ERROR(err);
+ err = PetscViewerDestroy(&viewer); CHECK_PETSC_ERROR(err);
} // write
// ----------------------------------------------------------------------
@@ -227,8 +227,8 @@
isSymmetric = false;
} // if
} // for
- MatDestroy(matDense);
- MatDestroy(matSparseAIJ);
+ MatDestroy(&matDense);
+ MatDestroy(&matSparseAIJ);
if (!isSymmetric)
throw std::runtime_error("Jacobian matrix is not symmetric.");
} // verifySymmetry
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestAbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestAbsorbingDampers.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestAbsorbingDampers.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -278,8 +278,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -417,8 +417,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
} // testIntegrateJacobian
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -297,8 +297,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -224,8 +224,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -306,8 +306,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -306,8 +306,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -243,8 +243,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-04-21 15:31:34 UTC (rev 18262)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-04-21 15:52:45 UTC (rev 18263)
@@ -184,8 +184,8 @@
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
- MatDestroy(jDense);
- MatDestroy(jSparseAIJ);
+ MatDestroy(&jDense);
+ MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
More information about the CIG-COMMITS
mailing list