[cig-commits] r7259 - in
short/3D/PyLith/trunk/unittests/libtests/faults: . data
brad at geodynamics.org
brad at geodynamics.org
Fri Jun 15 09:55:36 PDT 2007
Author: brad
Date: 2007-06-15 09:55:35 -0700 (Fri, 15 Jun 2007)
New Revision: 7259
Modified:
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
Log:
Added testing of constaint vertex and cohesive cell pairing for FaultCohesiveKin. Added unit tests for testing quad4 meshes with multiple cohesive cells.
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -127,6 +127,20 @@
vertexOrient[i], tolerance);
} // for
} // for
+
+ // Check pairing of constraint vertices with cells
+ iVertex = 0;
+ for (std::set<Mesh::point_type>::const_iterator v_iter=vertConstraintBegin;
+ v_iter != vertConstraintEnd;
+ ++v_iter, ++iVertex) {
+ const int fiberDim = fault._constraintCell->getFiberDimension(*v_iter);
+ CPPUNIT_ASSERT_EQUAL(1, fiberDim);
+ const int_section_type::value_type* vertexCell =
+ fault._constraintCell->restrictPoint(*v_iter);
+ CPPUNIT_ASSERT(0 != vertexCell);
+ CPPUNIT_ASSERT_EQUAL(_data->constraintCells[iVertex], vertexCell[0]);
+ } // for
+
} // testInitialize
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -33,6 +33,7 @@
fieldT(0),
orientation(0),
constraintVertices(0),
+ constraintCells(0),
valsResidual(0),
valsJacobian(0),
numConstraintVert(0)
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -67,6 +67,7 @@
//@{
double* orientation; ///< Expected values for fault orientation.
int* constraintVertices; ///< Expected points for constraint vertices
+ int* constraintCells; ///< Expected cells for constraint vertices
double* valsResidual; ///< Expected values from residual calculation.
double* valsJacobian; ///< Expected values from Jacobian calculation.
int numConstraintVert; ///< Number of constraint vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -137,6 +137,10 @@
15, 17, 19, 21
};
+const int pylith::faults::CohesiveKinDataHex8::_constraintCells[] = {
+ 22, 22, 22, 22
+};
+
const double pylith::faults::CohesiveKinDataHex8::_valsResidual[] = {
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
@@ -1383,6 +1387,7 @@
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintCells = const_cast<int*>(_constraintCells);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
numConstraintVert = _numConstraintVert;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -60,6 +60,7 @@
static const double _orientation[]; ///< Expected values for fault orientation.
static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintCells[]; ///< Expected cells for constraint vertices
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
static const int _numConstraintVert; ///< Number of constraint vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -85,6 +85,10 @@
6
};
+const int pylith::faults::CohesiveKinDataLine2::_constraintCells[] = {
+ 7
+};
+
const double pylith::faults::CohesiveKinDataLine2::_valsResidual[] = {
0.0,
0.0,
@@ -121,6 +125,7 @@
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintCells = const_cast<int*>(_constraintCells);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
numConstraintVert = _numConstraintVert;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -60,6 +60,7 @@
static const double _orientation[]; ///< Expected values for fault orientation.
static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintCells[]; ///< Expected cells for constraint vertices
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
static const int _numConstraintVert; ///< Number of constraint vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -114,6 +114,10 @@
9, 11
};
+const int pylith::faults::CohesiveKinDataQuad4::_constraintCells[] = {
+ 12, 12
+};
+
const double pylith::faults::CohesiveKinDataQuad4::_valsResidual[] = {
0.0, 0.0,
0.0, 0.0,
@@ -350,6 +354,7 @@
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintCells = const_cast<int*>(_constraintCells);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
numConstraintVert = _numConstraintVert;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -60,6 +60,7 @@
static const double _orientation[]; ///< Expected values for fault orientation.
static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintCells[]; ///< Expected cells for constraint vertices
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
static const int _numConstraintVert; ///< Number of constraint vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -103,6 +103,10 @@
8, 10, 12
};
+const int pylith::faults::CohesiveKinDataTet4::_constraintCells[] = {
+ 13, 13, 13
+};
+
const double pylith::faults::CohesiveKinDataTet4::_valsResidual[] = {
0.0, 0.0, 0.0,
0.0, 0.0, 0.0,
@@ -503,6 +507,7 @@
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintCells = const_cast<int*>(_constraintCells);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
numConstraintVert = _numConstraintVert;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -60,6 +60,7 @@
static const double _orientation[]; ///< Expected values for fault orientation.
static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintCells[]; ///< Expected cells for constraint vertices
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
static const int _numConstraintVert; ///< Number of constraint vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -114,6 +114,10 @@
7, 9
};
+const int pylith::faults::CohesiveKinDataTri3::_constraintCells[] = {
+ 10, 10
+};
+
const double pylith::faults::CohesiveKinDataTri3::_valsResidual[] = {
0.0, 0.0,
0.0, 0.0,
@@ -276,6 +280,7 @@
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintCells = const_cast<int*>(_constraintCells);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
numConstraintVert = _numConstraintVert;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -60,6 +60,7 @@
static const double _orientation[]; ///< Expected values for fault orientation.
static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintCells[]; ///< Expected cells for constraint vertices
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
static const int _numConstraintVert; ///< Number of constraint vertices
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2007-06-15 16:55:35 UTC (rev 7259)
@@ -135,6 +135,10 @@
11, 13, 15
};
+const int pylith::faults::CohesiveKinDataTri3d::_constraintCells[] = {
+ 16, 16, 17
+};
+
const double pylith::faults::CohesiveKinDataTri3d::_valsResidual[] = {
0.0, 0.0,
0.0, 0.0,
@@ -461,6 +465,7 @@
fieldT = const_cast<double*>(_fieldT);
orientation = const_cast<double*>(_orientation);
constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintCells = const_cast<int*>(_constraintCells);
valsResidual = const_cast<double*>(_valsResidual);
valsJacobian = const_cast<double*>(_valsJacobian);
numConstraintVert = _numConstraintVert;
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2007-06-15 16:54:56 UTC (rev 7258)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh 2007-06-15 16:55:35 UTC (rev 7259)
@@ -60,6 +60,7 @@
static const double _orientation[]; ///< Expected values for fault orientation.
static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintCells[]; ///< Expected cells for constraint vertices
static const double _valsResidual[]; ///< Expected values from residual calculation.
static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
static const int _numConstraintVert; ///< Number of constraint vertices
More information about the cig-commits
mailing list