[cig-commits] [commit] knepley/upgrade-petsc-interface: Updated fault impulse tests for interpolated meshes. (38a7730)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Nov 1 15:46:07 PDT 2013
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/4563c9e7cd0256b4959f19a292519af56758929f...84adc7d44006b6a1b12396431f5beb8d8cec2ff9
>---------------------------------------------------------------
commit 38a7730b004483aa91fd0a42657f73fbb16891c0
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Fri Nov 1 15:47:15 2013 -0700
Updated fault impulse tests for interpolated meshes.
>---------------------------------------------------------------
38a7730b004483aa91fd0a42657f73fbb16891c0
.../libtests/faults/TestFaultCohesiveImpulses.cc | 74 ++++++++++++----------
.../libtests/faults/TestFaultCohesiveImpulses.hh | 8 +--
.../libtests/faults/data/CohesiveImpulsesData.cc | 4 +-
.../libtests/faults/data/CohesiveImpulsesData.hh | 4 +-
.../faults/data/CohesiveImpulsesDataHex8.cc | 30 ++++-----
.../faults/data/CohesiveImpulsesDataHex8.hh | 4 +-
.../faults/data/CohesiveImpulsesDataQuad4.cc | 8 +--
.../faults/data/CohesiveImpulsesDataQuad4.hh | 4 +-
.../faults/data/CohesiveImpulsesDataTet4.cc | 8 +--
.../faults/data/CohesiveImpulsesDataTet4.hh | 4 +-
.../faults/data/CohesiveImpulsesDataTri3.cc | 26 ++++----
.../faults/data/CohesiveImpulsesDataTri3.hh | 4 +-
12 files changed, 94 insertions(+), 84 deletions(-)
diff --git a/unittests/libtests/faults/TestFaultCohesiveImpulses.cc b/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
index 2ee4d76..3a8a74f 100644
--- a/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
+++ b/unittests/libtests/faults/TestFaultCohesiveImpulses.cc
@@ -194,10 +194,10 @@ pylith::faults::TestFaultCohesiveImpulses::testInitialize(void)
} // for
err = ISRestoreIndices(subpointIS, &points);PYLITH_CHECK_ERROR(err);
err = ISDestroy(&subpointIS);PYLITH_CHECK_ERROR(err);
- CPPUNIT_ASSERT_EQUAL(_data->numConstraintVert, vEnd-vStart);
+ CPPUNIT_ASSERT_EQUAL(_data->numConstraintEdges, vEnd-vStart);
// Check orientation
- //fault._fields->get("orientation").view("ORIENTATION"); // DEBUGGING
+ fault._fields->get("orientation").view("ORIENTATION"); // DEBUGGING
topology::VecVisitorMesh orientationVisitor(fault._fields->get("orientation"));
const PetscScalar* orientationArray = orientationVisitor.localArray();
@@ -251,19 +251,28 @@ pylith::faults::TestFaultCohesiveImpulses::testIntegrateResidual(void)
const int spaceDim = _data->spaceDim;
PetscDM dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
- topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
- const PetscInt vStart = verticesStratum.begin();
- const PetscInt vEnd = verticesStratum.end();
+ PetscInt pStart, pEnd;
- topology::VecVisitorMesh dispVisitor(fields.get("disp(t)"));
+ // Set displacement values
+ topology::Field& disp = fields.get("disp(t)");
+ topology::VecVisitorMesh dispVisitor(disp);
+ PetscErrorCode err = PetscSectionGetChart(disp.petscSection(), &pStart, &pEnd);CPPUNIT_ASSERT(!err);
PetscScalar* dispArray = dispVisitor.localArray();CPPUNIT_ASSERT(dispArray);
-
- for(PetscInt v = vStart, iVertex=0; v < vEnd; ++v, ++iVertex) {
- const PetscInt off = dispVisitor.sectionOffset(v);
- for(PetscInt d = 0; d < spaceDim; ++d)
- dispArray[off+d] = _data->fieldT[iVertex*spaceDim+d] / _data->lengthScale;
+ for (PetscInt p = pStart, iVertex = 0; p < pEnd; ++p) {
+ if (dispVisitor.sectionDof(p) > 0) {
+ const PetscInt off = dispVisitor.sectionOffset(p);
+ CPPUNIT_ASSERT_EQUAL(spaceDim, dispVisitor.sectionDof(p));
+ for(PetscInt d = 0; d < spaceDim; ++d) {
+ dispArray[off+d] = _data->fieldT[iVertex*spaceDim+d] / _data->lengthScale;
+ } // for
+ ++iVertex;
+ } // if
} // for
+ topology::Stratum verticesStratum(dmMesh, topology::Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+ const PetscInt vEnd = verticesStratum.end();
+
const PylithScalar t = 1.0;
const PylithScalar dt = 1.0;
fault.timeStep(dt);
@@ -271,28 +280,28 @@ pylith::faults::TestFaultCohesiveImpulses::testIntegrateResidual(void)
topology::Field& residual = fields.get("residual");
residual.zero();
fault.integrateResidual(residual, t, &fields);
- //residual.view("RESIDUAL"); // DEBUGGING
+ residual.view("RESIDUAL"); // DEBUGGING
topology::VecVisitorMesh residualVisitor(residual);
const PetscScalar* residualArray = residualVisitor.localArray();CPPUNIT_ASSERT(residualArray);
// Check values
- const PylithScalar* valsE = _data->residual;
const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
const PylithScalar residualScale = pow(_data->lengthScale, spaceDim);
- for(PetscInt v = vStart, iVertex = 0; v < vEnd; ++v, ++iVertex) {
- const PetscInt off = residualVisitor.sectionOffset(v);
- CPPUNIT_ASSERT_EQUAL(spaceDim, residualVisitor.sectionDof(v));
-
- for(PetscInt d = 0; d < spaceDim; ++d) {
- const PylithScalar valE = valsE[iVertex*spaceDim+d];
- if (fabs(valE) > tolerance) {
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, residualArray[off+d]/valE*residualScale, tolerance);
- } else {
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, residualArray[off+d]*residualScale, tolerance);
- } // if/else
- } // for
+ for (PetscInt p = pStart, iPoint = 0; p < pEnd; ++p) {
+ if (residualVisitor.sectionDof(p) > 0) {
+ const PetscInt off = residualVisitor.sectionOffset(p);
+ CPPUNIT_ASSERT_EQUAL(spaceDim, residualVisitor.sectionDof(p));
+ for(PetscInt d = 0; d < spaceDim; ++d) {
+ const PylithScalar valE = _data->residual[iPoint*spaceDim+d];
+ if (fabs(valE) > tolerance)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, residualArray[off+d]/valE*residualScale, tolerance);
+ else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, residualArray[off+d]*residualScale, tolerance);
+ } // for
+ ++iPoint;
+ } // if
} // for
PYLITH_METHOD_END;
@@ -382,6 +391,7 @@ pylith::faults::TestFaultCohesiveImpulses::_initialize(topology::Mesh* const mes
residual.subfieldAdd("lagrange multiplier", spaceDim);
residual.subfieldsSetup();
residual.setupSolnChart();
+ residual.setupSolnDof(spaceDim);
fault->setupSolnDof(&residual);
residual.allocate();
residual.zero();
@@ -394,23 +404,23 @@ pylith::faults::TestFaultCohesiveImpulses::_initialize(topology::Mesh* const mes
} // _initialize
// ----------------------------------------------------------------------
-// Determine if vertex is a Lagrange multiplier constraint vertex.
+// Determine if point is a Lagrange multiplier constraint point.
bool
-pylith::faults::TestFaultCohesiveImpulses::_isConstraintVertex(const int vertex) const
-{ // _isConstraintVertex
+pylith::faults::TestFaultCohesiveImpulses::_isConstraintEdge(const int point) const
+{ // _isConstraintEdge
PYLITH_METHOD_BEGIN;
assert(_data);
- const int numConstraintVert = _data->numConstraintVert;
+ const int numConstraintEdges = _data->numConstraintEdges;
bool isFound = false;
- for (int i=0; i < _data->numConstraintVert; ++i)
- if (_data->constraintVertices[i] == vertex) {
+ for (int i=0; i < _data->numConstraintEdges; ++i)
+ if (_data->constraintEdges[i] == point) {
isFound = true;
break;
} // if
PYLITH_METHOD_RETURN(isFound);
-} // _isConstraintVertex
+} // _isConstraintEdge
// End of file
diff --git a/unittests/libtests/faults/TestFaultCohesiveImpulses.hh b/unittests/libtests/faults/TestFaultCohesiveImpulses.hh
index ef74ac5..16015c6 100644
--- a/unittests/libtests/faults/TestFaultCohesiveImpulses.hh
+++ b/unittests/libtests/faults/TestFaultCohesiveImpulses.hh
@@ -114,13 +114,13 @@ private:
FaultCohesiveImpulses* const fault,
topology::SolutionFields* const fields);
- /** Determine if vertex is a Lagrange multiplier constraint vertex.
+ /** Determine if point is a Lagrange multiplier constraint point.
*
- * @param vertex Label of vertex.
+ * @param point Label of point.
*
- * @returns True if vertex is a constraint vertex, false otherwise.
+ * @returns True if point is a constraint point, false otherwise.
*/
- bool _isConstraintVertex(const int vertex) const;
+ bool _isConstraintEdge(const int point) const;
}; // class TestFaultCohesiveImpulses
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesData.cc b/unittests/libtests/faults/data/CohesiveImpulsesData.cc
index ddfab51..d06cc2e 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesData.cc
+++ b/unittests/libtests/faults/data/CohesiveImpulsesData.cc
@@ -47,8 +47,8 @@ pylith::faults::CohesiveImpulsesData::CohesiveImpulsesData(void) :
amplitude(0),
numImpulses(0),
residual(0),
- constraintVertices(0),
- numConstraintVert(0)
+ constraintEdges(0),
+ numConstraintEdges(0)
{ // constructor
const PylithScalar velScale = lengthScale / timeScale;
densityScale = pressureScale / (velScale*velScale);
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesData.hh b/unittests/libtests/faults/data/CohesiveImpulsesData.hh
index 7ae5796..bf554ba 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesData.hh
+++ b/unittests/libtests/faults/data/CohesiveImpulsesData.hh
@@ -90,9 +90,9 @@ public:
/// Expected values from residual calculation.
PylithScalar* residual;
- int* constraintVertices; ///< Expected points for constraint vertices
+ int* constraintEdges; ///< Expected points for constraint edges
int* negativeVertices; ///< Expected points for negative side fault vertices
- int numConstraintVert; ///< Number of constraint vertices
+ int numConstraintEdges; ///< Number of constraint edges
//@}
};
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc b/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc
index 2c777a5..e46e470 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.cc
@@ -29,7 +29,7 @@
* Cells are 0-1,2 and vertices are 3-18,19-22.
*
* 3,4,5,6 -------- 7,8,9,10 -- 15,16,17,18 -------- 11,12,13,14
- * 19,20,21,22
+ * 59,60,61,62
* ^^^^^^^^^^^^^^^^^^^^^^ Cohesive element
*
*/
@@ -157,10 +157,10 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataHex8::_fieldIncr[] = {
// ----------------------------------------------------------------------
const PylithScalar pylith::faults::CohesiveImpulsesDataHex8::_orientation[] = {
- 0.0, -1.0, 0.0, 0.0, 0.0, +1.0, -1.0, 0.0, 0.0,
- 0.0, -1.0, 0.0, 0.0, 0.0, +1.0, -1.0, 0.0, 0.0,
- 0.0, -1.0, 0.0, 0.0, 0.0, +1.0, -1.0, 0.0, 0.0,
- 0.0, -1.0, 0.0, 0.0, 0.0, +1.0, -1.0, 0.0, 0.0,
+ 0.0, +1.0, 0.0, 0.0, 0.0, +1.0, +1.0, 0.0, 0.0,
+ 0.0, +1.0, 0.0, 0.0, 0.0, +1.0, +1.0, 0.0, 0.0,
+ 0.0, +1.0, 0.0, 0.0, 0.0, +1.0, +1.0, 0.0, 0.0,
+ 0.0, +1.0, 0.0, 0.0, 0.0, +1.0, +1.0, 0.0, 0.0,
};
const PylithScalar pylith::faults::CohesiveImpulsesDataHex8::_area[] = {
@@ -176,11 +176,11 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataHex8::_amplitude[4] = {
const int pylith::faults::CohesiveImpulsesDataHex8::_numImpulses = 3;
-const int pylith::faults::CohesiveImpulsesDataHex8::_numConstraintVert = 4;
-const int pylith::faults::CohesiveImpulsesDataHex8::_constraintVertices[4] = {
- 19, 20, 21, 22
+const int pylith::faults::CohesiveImpulsesDataHex8::_numConstraintEdges = 4;
+const int pylith::faults::CohesiveImpulsesDataHex8::_constraintEdges[4] = {
+ 59, 60, 61, 62
};
-const int pylith::faults::CohesiveImpulsesDataHex8::_negativeVertices[] = {
+const int pylith::faults::CohesiveImpulsesDataHex8::_negativeVertices[4] = {
7, 8, 9, 10
};
@@ -203,16 +203,16 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataHex8::_residual[] = {
-5.0, -7.0, -9.0, // 18
// 19 (constraint)
- -(5.3-4.5+0.0), -(7.3-6.5+0.0), -(9.3-8.5+0.0),
+ -(5.3-4.5-0.0), -(7.3-6.5+0.0), -(9.3-8.5-0.0),
// 20 (constraint)
- -(5.5-4.6+0.0), -(7.5-6.6+0.0), -(9.5-8.6+0.0),
+ -(5.5-4.6-0.0), -(7.5-6.6+0.0), -(9.5-8.6-1.6),
// 21 (constraint)
- -(5.7-4.7+0.0), -(7.7-6.7+0.0), -(9.7-8.7+0.0),
+ -(5.7-4.7-0.0), -(7.7-6.7+0.0), -(9.7-8.7-0.0),
// 22 (constraint)
- -(5.9-4.8+0.0), -(7.9-6.8+0.0), -(9.9-8.8-1.2),
+ -(5.9-4.8-0.0), -(7.9-6.8+0.0), -(9.9-8.8-0.0),
};
pylith::faults::CohesiveImpulsesDataHex8::CohesiveImpulsesDataHex8(void)
@@ -239,9 +239,9 @@ pylith::faults::CohesiveImpulsesDataHex8::CohesiveImpulsesDataHex8(void)
amplitude = const_cast<PylithScalar*>(_amplitude);
numImpulses = _numImpulses;
residual = const_cast<PylithScalar*>(_residual);
- constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintEdges = const_cast<int*>(_constraintEdges);
negativeVertices = const_cast<int*>(_negativeVertices);
- numConstraintVert = _numConstraintVert;
+ numConstraintEdges = _numConstraintEdges;
} // constructor
pylith::faults::CohesiveImpulsesDataHex8::~CohesiveImpulsesDataHex8(void)
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.hh b/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.hh
index 7b9aa1c..63f4f6e 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.hh
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataHex8.hh
@@ -71,9 +71,9 @@ private:
static const int _numImpulses; ///< Number of impulses.
static const PylithScalar _residual[]; ///< Expected values from residual.
- static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintEdges[]; ///< Expected points for constraint edges
static const int _negativeVertices[]; ///< Expected points for negative-side fault vertices
- static const int _numConstraintVert; ///< Number of constraint vertices
+ static const int _numConstraintEdges; ///< Number of constraint edges
};
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc b/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc
index 0e4eb97..a599856 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.cc
@@ -141,8 +141,8 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataQuad4::_amplitude[] = {
const int pylith::faults::CohesiveImpulsesDataQuad4::_numImpulses = 2;
-const int pylith::faults::CohesiveImpulsesDataQuad4::_numConstraintVert = 2;
-const int pylith::faults::CohesiveImpulsesDataQuad4::_constraintVertices[] = {
+const int pylith::faults::CohesiveImpulsesDataQuad4::_numConstraintEdges = 2;
+const int pylith::faults::CohesiveImpulsesDataQuad4::_constraintEdges[] = {
11, 12
};
const int pylith::faults::CohesiveImpulsesDataQuad4::_negativeVertices[] = {
@@ -188,9 +188,9 @@ pylith::faults::CohesiveImpulsesDataQuad4::CohesiveImpulsesDataQuad4(void)
amplitude = const_cast<PylithScalar*>(_amplitude);
numImpulses = _numImpulses;
residual = const_cast<PylithScalar*>(_residual);
- constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintEdges = const_cast<int*>(_constraintEdges);
negativeVertices = const_cast<int*>(_negativeVertices);
- numConstraintVert = _numConstraintVert;
+ numConstraintEdges = _numConstraintEdges;
} // constructor
pylith::faults::CohesiveImpulsesDataQuad4::~CohesiveImpulsesDataQuad4(void)
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.hh b/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.hh
index c3948cb..08c7c4a 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.hh
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataQuad4.hh
@@ -71,9 +71,9 @@ private:
static const int _numImpulses; ///< Number of impulses.
static const PylithScalar _residual[]; ///< Expected values from residual calculation.
- static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintEdges[]; ///< Expected points for constraint edges
static const int _negativeVertices[]; ///< Expected points for negative-side fault vertices
- static const int _numConstraintVert; ///< Number of constraint vertices
+ static const int _numConstraintEdges; ///< Number of constraint edges
};
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc b/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc
index 623f9d2..49fef10 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.cc
@@ -144,8 +144,8 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataTet4::_amplitude[3] = {
const int pylith::faults::CohesiveImpulsesDataTet4::_numImpulses = 4;
-const int pylith::faults::CohesiveImpulsesDataTet4::_numConstraintVert = 3;
-const int pylith::faults::CohesiveImpulsesDataTet4::_constraintVertices[] = {
+const int pylith::faults::CohesiveImpulsesDataTet4::_numConstraintEdges = 3;
+const int pylith::faults::CohesiveImpulsesDataTet4::_constraintEdges[] = {
11, 12, 13,
};
const int pylith::faults::CohesiveImpulsesDataTet4::_negativeVertices[] = {
@@ -196,9 +196,9 @@ pylith::faults::CohesiveImpulsesDataTet4::CohesiveImpulsesDataTet4(void)
amplitude = const_cast<PylithScalar*>(_amplitude);
numImpulses = _numImpulses;
residual = const_cast<PylithScalar*>(_residual);
- constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintEdges = const_cast<int*>(_constraintEdges);
negativeVertices = const_cast<int*>(_negativeVertices);
- numConstraintVert = _numConstraintVert;
+ numConstraintEdges = _numConstraintEdges;
} // constructor
pylith::faults::CohesiveImpulsesDataTet4::~CohesiveImpulsesDataTet4(void)
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.hh b/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.hh
index 0bcfcae..abeef3a 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.hh
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataTet4.hh
@@ -71,9 +71,9 @@ private:
static const int _numImpulses; ///< Number of impulses.
static const PylithScalar _residual[]; ///< Expected values from residual calculation.
- static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintEdges[]; ///< Expected points for constraint edges
static const int _negativeVertices[]; ///< Expected points for negative-side fault vertices
- static const int _numConstraintVert; ///< Number of constraint vertices
+ static const int _numConstraintEdges; ///< Number of constraint edges
};
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.cc b/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.cc
index b87e00f..7a0aef9 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.cc
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.cc
@@ -37,7 +37,7 @@
*
* Cells are 0-1, 2, vertices are 3-8,9-10.
*
- * 7 -9- 4
+ * 7 -15- 4
* /| |\
* / | | \
* / | | \
@@ -47,7 +47,7 @@
* \ | | /
* \ | | /
* \| |/
- * 8-10- 5
+ * 8-16- 5
*/
#include "CohesiveImpulsesDataTri3.hh"
@@ -124,8 +124,8 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataTri3::_fieldIncr[] = {
// ----------------------------------------------------------------------
const PylithScalar pylith::faults::CohesiveImpulsesDataTri3::_orientation[] = {
- 0.0, -1.0, -1.0, 0.0,
- 0.0, -1.0, -1.0, 0.0
+ 0.0, +1.0, +1.0, 0.0,
+ 0.0, +1.0, +1.0, 0.0
};
const PylithScalar pylith::faults::CohesiveImpulsesDataTri3::_area[] = {
@@ -140,9 +140,9 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataTri3::_amplitude[] = {
const int pylith::faults::CohesiveImpulsesDataTri3::_numImpulses = 2;
-const int pylith::faults::CohesiveImpulsesDataTri3::_numConstraintVert = 2;
-const int pylith::faults::CohesiveImpulsesDataTri3::_constraintVertices[] = {
- 9, 10
+const int pylith::faults::CohesiveImpulsesDataTri3::_numConstraintEdges = 2;
+const int pylith::faults::CohesiveImpulsesDataTri3::_constraintEdges[] = {
+ 15, 16
};
const int pylith::faults::CohesiveImpulsesDataTri3::_negativeVertices[] = {
4, 5
@@ -155,10 +155,10 @@ const PylithScalar pylith::faults::CohesiveImpulsesDataTri3::_residual[] = {
0.0, 0.0,
-8.6, -9.6, // 6
-8.8, -9.8, // 7
- -(8.5-8.2) - (0),
- -(9.5-9.2) - (0), // 8
- -(8.7-8.3) - (2.1),
- -(9.7-9.3) - (0), // 9
+ -(8.5-8.2) + (2.0),
+ -(9.5-9.2) + (0), // 8
+ -(8.7-8.3) + (0),
+ -(9.7-9.3) + (0), // 9
};
pylith::faults::CohesiveImpulsesDataTri3::CohesiveImpulsesDataTri3(void)
@@ -185,9 +185,9 @@ pylith::faults::CohesiveImpulsesDataTri3::CohesiveImpulsesDataTri3(void)
amplitude = const_cast<PylithScalar*>(_amplitude);
numImpulses = _numImpulses;
residual = const_cast<PylithScalar*>(_residual);
- constraintVertices = const_cast<int*>(_constraintVertices);
+ constraintEdges = const_cast<int*>(_constraintEdges);
negativeVertices = const_cast<int*>(_negativeVertices);
- numConstraintVert = _numConstraintVert;
+ numConstraintEdges = _numConstraintEdges;
} // constructor
pylith::faults::CohesiveImpulsesDataTri3::~CohesiveImpulsesDataTri3(void)
diff --git a/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.hh b/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.hh
index 5af3534..0911fbe 100644
--- a/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.hh
+++ b/unittests/libtests/faults/data/CohesiveImpulsesDataTri3.hh
@@ -71,9 +71,9 @@ private:
static const int _numImpulses; ///< Number of impulses.
static const PylithScalar _residual[]; ///< Expected values from residual calculation.
- static const int _constraintVertices[]; ///< Expected points for constraint vertices
+ static const int _constraintEdges[]; ///< Expected points for constraint edges
static const int _negativeVertices[]; ///< Expected points for negative-side fault vertices
- static const int _numConstraintVert; ///< Number of constraint vertices
+ static const int _numConstraintEdges; ///< Number of constraint edges
};
More information about the CIG-COMMITS
mailing list