[cig-commits] r19494 - in short/3D/PyLith/branches/v1.6-stable/unittests/libtests: bc faults feassemble
brad at geodynamics.org
brad at geodynamics.org
Fri Jan 27 08:06:04 PST 2012
Author: brad
Date: 2012-01-27 08:06:03 -0800 (Fri, 27 Jan 2012)
New Revision: 19494
Modified:
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/bc/TestAbsorbingDampers.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
Log:
Update matrix conversion in unit tests for consistency with petsc-dev.
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/bc/TestAbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/bc/TestAbsorbingDampers.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/bc/TestAbsorbingDampers.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -249,9 +249,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -279,7 +277,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/faults/TestFaultCohesiveKin.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -399,9 +399,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -429,7 +427,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
CPPUNIT_ASSERT_EQUAL(false, fault.needNewJacobian());
} // testIntegrateJacobian
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicit.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -288,9 +288,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -310,7 +308,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -203,9 +203,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -225,7 +223,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -285,9 +285,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -307,7 +305,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -285,9 +285,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -307,7 +305,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicit.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -222,9 +222,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -244,7 +242,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2012-01-27 16:04:59 UTC (rev 19493)
+++ short/3D/PyLith/branches/v1.6-stable/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2012-01-27 16:06:03 UTC (rev 19494)
@@ -163,9 +163,7 @@
CPPUNIT_ASSERT_EQUAL(ncolsE, ncols);
PetscMat jDense;
- PetscMat jSparseAIJ;
- MatConvert(jacobianMat, MATSEQAIJ, MAT_INITIAL_MATRIX, &jSparseAIJ);
- MatConvert(jSparseAIJ, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
+ MatConvert(jacobianMat, MATSEQDENSE, MAT_INITIAL_MATRIX, &jDense);
double_array vals(nrows*ncols);
int_array rows(nrows);
@@ -185,7 +183,6 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
} // for
MatDestroy(&jDense);
- MatDestroy(&jSparseAIJ);
} // testIntegrateJacobian
// ----------------------------------------------------------------------
More information about the CIG-COMMITS
mailing list