[cig-commits] r18945 - in short/3D/PyLith/trunk: libsrc/pylith/bc libsrc/pylith/faults unittests/libtests/bc unittests/libtests/faults unittests/libtests/feassemble unittests/libtests/materials
brad at geodynamics.org
brad at geodynamics.org
Mon Sep 19 16:39:57 PDT 2011
Author: brad
Date: 2011-09-19 16:39:56 -0700 (Mon, 19 Sep 2011)
New Revision: 18945
Modified:
short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.hh
short/3D/PyLith/trunk/libsrc/pylith/bc/BoundaryCondition.hh
short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.hh
short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.hh
short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.hh
short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.hh
short/3D/PyLith/trunk/libsrc/pylith/faults/Fault.hh
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.hh
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.hh
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.hh
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.hh
short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBCMulti.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc
short/3D/PyLith/trunk/unittests/libtests/bc/TestPointForce.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
Log:
Cleanup of unit test tolerances for single/double precision. Eliminate use of double[3] as argument (use PylithScalar).
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -75,7 +75,7 @@
// vector at integration points.
void
pylith::bc::AbsorbingDampers::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
assert(0 != _boundaryMesh);
assert(0 != _quadrature);
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -90,7 +90,7 @@
* direction that is not collinear with surface normal.
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Integrate contributions to residual term (r) for operator.
*
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/BoundaryCondition.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/BoundaryCondition.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/BoundaryCondition.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -83,7 +83,7 @@
*/
virtual
void initialize(const topology::Mesh& mesh,
- const double upDir[3]) = 0;
+ const PylithScalar upDir[3]) = 0;
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -61,7 +61,7 @@
// Initialize boundary condition.
void
pylith::bc::DirichletBC::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
if (0 == _bcDOF.size())
return;
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBC.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -65,7 +65,7 @@
* @param upDir Vertical direction (somtimes used in 3-D problems).
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Set number of degrees of freedom that are constrained at points in field.
*
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -62,7 +62,7 @@
// Initialize boundary condition.
void
pylith::bc::DirichletBoundary::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
DirichletBC::initialize(mesh, upDir);
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/DirichletBoundary.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -53,7 +53,7 @@
* @param upDir Vertical direction (somtimes used in 3-D problems).
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Get boundary mesh.
*
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -70,7 +70,7 @@
// vector at integration points.
void
pylith::bc::Neumann::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
ALE::MemoryLogger& logger = ALE::MemoryLogger::singleton();
logger.stagePush("BoundaryConditions");
@@ -495,7 +495,7 @@
// Initialize boundary condition. Determine orienation and compute traction
// vector at integration points.
void
- pylith::bc::Neumann::_paramsLocalToGlobal(const double upDir[3])
+ pylith::bc::Neumann::_paramsLocalToGlobal(const PylithScalar upDir[3])
{ // _paramsLocalToGlobal
assert(_boundaryMesh);
assert(_parameters);
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -56,7 +56,7 @@
* direction that is not collinear with surface normal.
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Integrate contributions to residual term (r) for operator.
*
@@ -122,7 +122,7 @@
* @param upDir Direction perpendicular to horizontal surface tangent
* direction that is not collinear with surface normal.
*/
- void _paramsLocalToGlobal(const double upDir[3]);
+ void _paramsLocalToGlobal(const PylithScalar upDir[3]);
/** Calculate spatial and temporal variation of value over the list
* of submesh.
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -62,7 +62,7 @@
// Initialize boundary condition.
void
pylith::bc::PointForce::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
if (0 == _bcDOF.size())
return;
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/PointForce.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -55,7 +55,7 @@
* @param upDir Vertical direction (somtimes used in 3-D problems).
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Integrate contributions to residual term (r) for operator.
*
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/Fault.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/Fault.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/Fault.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -115,7 +115,7 @@
*/
virtual
void initialize(const topology::Mesh& mesh,
- const double upDir[3]) = 0;
+ const PylithScalar upDir[3]) = 0;
/** Get mesh associated with fault fields.
*
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -115,7 +115,7 @@
// Initialize fault. Determine orientation and setup boundary
void
pylith::faults::FaultCohesiveDyn::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
assert(0 != upDir);
assert(0 != _quadrature);
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveDyn.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -76,7 +76,7 @@
* be up-dip direction; applies to fault surfaces in 2-D and 3-D).
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Integrate contributions to residual term (r) for operator that
* do not require assembly across processors.
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -97,7 +97,7 @@
// Initialize fault. Determine orientation and setup boundary
void
pylith::faults::FaultCohesiveKin::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
assert(0 != upDir);
assert(0 != _quadrature);
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveKin.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -73,7 +73,7 @@
* be up-dip direction; applies to fault surfaces in 2-D and 3-D).
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Integrate contributions to residual term (r) for operator that
* do not require assembly across cells, vertices, or processors.
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -83,7 +83,7 @@
// Initialize fault. Determine orientation and setup boundary
void
pylith::faults::FaultCohesiveLagrange::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
assert(0 != upDir);
assert(0 != _quadrature);
@@ -1547,7 +1547,7 @@
// ----------------------------------------------------------------------
// Calculate orientation at fault vertices.
void
-pylith::faults::FaultCohesiveLagrange::_calcOrientation(const double upDir[3])
+pylith::faults::FaultCohesiveLagrange::_calcOrientation(const PylithScalar upDir[3])
{ // _calcOrientation
assert(0 != upDir);
assert(0 != _faultMesh);
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -110,7 +110,7 @@
*/
virtual
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Split solution field for separate preconditioning.
*
@@ -356,7 +356,7 @@
* not collinear with fault normal (usually "up" direction but could
* be up-dip direction; applies to fault surfaces in 2-D and 3-D).
*/
- void _calcOrientation(const double upDir[3]);
+ void _calcOrientation(const PylithScalar upDir[3]);
/// Calculate fault area field.
void _calcArea(void);
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -71,7 +71,7 @@
// Initialize fault. Determine orientation and setup boundary
void
pylith::faults::FaultCohesiveTract::initialize(const topology::Mesh& mesh,
- const double upDir[3])
+ const PylithScalar upDir[3])
{ // initialize
assert(0 != upDir);
assert(0 != _quadrature);
@@ -196,7 +196,7 @@
// ----------------------------------------------------------------------
// Calculate orientation at fault vertices.
void
-pylith::faults::FaultCohesiveTract::_calcOrientation(const double upDir[3])
+pylith::faults::FaultCohesiveTract::_calcOrientation(const PylithScalar upDir[3])
{ // _calcOrientation
assert(0 != _fields);
assert(0 != _quadrature);
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.hh 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveTract.hh 2011-09-19 23:39:56 UTC (rev 18945)
@@ -65,7 +65,7 @@
* be up-dip direction; applies to fault surfaces in 2-D and 3-D).
*/
void initialize(const topology::Mesh& mesh,
- const double upDir[3]);
+ const PylithScalar upDir[3]);
/** Integrate contribution of cohesive cells to residual term.
*
@@ -125,7 +125,7 @@
* not collinear with fault normal (usually "up" direction but could
* be up-dip direction; applies to fault surfaces in 2-D and 3-D).
*/
- void _calcOrientation(const double upDir[3]);
+ void _calcOrientation(const PylithScalar upDir[3]);
/** Get initial tractions using a spatial database.
*/
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestAbsorbingDampers.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -397,7 +397,7 @@
db.ioHandler(&dbIO);
db.queryType(spatialdata::spatialdb::SimpleDB::NEAREST);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
bc->quadrature(_quadrature);
bc->timeStep(_data->dt);
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBC.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -530,7 +530,7 @@
};
dbRate.setData(names, units, values, numValues);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
bc->label(_data->label);
bc->dbInitial(&db);
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBCMulti.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBCMulti.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBCMulti.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -305,7 +305,7 @@
dbIORate.filename(_data->dbFilenameARate);
dbRate.ioHandler(&dbIORate);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
bcA->label(_data->labelA);
bcA->dbInitial(&db);
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestDirichletBoundary.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -146,7 +146,7 @@
};
dbRate.setData(names, units, values, numValues);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
bc->label(_data->label);
bc->dbInitial(&db);
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestNeumann.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -392,7 +392,7 @@
const PylithScalar pressureScale = _TestNeumann::pressureScale;
const PylithScalar timeScale = _TestNeumann::timeScale;
bc._queryDatabases();
- const double upDir[3] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[3] = { 0.0, 0.0, 1.0 };
bc._paramsLocalToGlobal(upDir);
const PylithScalar tolerance = 1.0e-06;
@@ -727,7 +727,7 @@
db.ioHandler(&dbIO);
db.queryType(spatialdata::spatialdb::SimpleDB::LINEAR);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
bc->dbInitial(&db);
bc->initialize(*mesh, upDir);
Modified: short/3D/PyLith/trunk/unittests/libtests/bc/TestPointForce.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/bc/TestPointForce.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/bc/TestPointForce.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -259,7 +259,7 @@
dbRate.setData(names, units, values, numValues);
} // rate db
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
bc->label(_data->label);
bc->dbInitial(&dbInitial);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -741,7 +741,7 @@
mesh->coordsys(&cs);
mesh->nondimensionalize(normalizer);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
fault->initialize(*mesh, upDir);
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -929,7 +929,7 @@
mesh->coordsys(&cs);
mesh->nondimensionalize(normalizer);
- const double upDir[] = { 0.0, 0.0, 1.0 };
+ const PylithScalar upDir[] = { 0.0, 0.0, 1.0 };
fault->initialize(*mesh, upDir);
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -174,17 +174,17 @@
for (int iCol=0; iCol < ncols; ++iCol)
cols[iCol] = iCol;
MatGetValues(jDense, nrows, &rows[0], ncols, &cols[0], &vals[0]);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
+ const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 2.0e-05;
for (int iRow=0; iRow < nrows; ++iRow)
for (int iCol=0; iCol < ncols; ++iCol) {
const int index = ncols*iRow+iCol;
- if (fabs(valsE[index]) > 1.0)
- {
- std::cout << "valE: " << valsE[index] << ", val: " << vals[index] << std::endl;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[index]/valsE[index], tolerance);
- }
- else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[index], vals[index], tolerance);
+ const PylithScalar valE = valsE[index];
+ if (fabs(valE) > 1.0) {
+ // Adjust tolerance based on magnitude of expected value compared to typical Jacobian values of 1.0e+11
+ const PylithScalar toleranceAdj = (fabs(valE) < 1.0e+10) ? tolerance*1.0e+11/fabs(valE) : tolerance;
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[index]/valE, toleranceAdj);
+ } else
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(valE, vals[index], tolerance);
} // for
MatDestroy(&jDense);
MatDestroy(&jSparseAIJ);
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2011-09-19 22:53:19 UTC (rev 18944)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2011-09-19 23:39:56 UTC (rev 18945)
@@ -492,7 +492,7 @@
const PylithScalar* stressE = &data->stress[iLoc*tensorSize];
CPPUNIT_ASSERT(0 != stressE);
- const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
+ const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
for (int i=0; i < tensorSize; ++i)
if (fabs(stressE[i]) > tolerance)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stress[i]/stressE[i],
More information about the CIG-COMMITS
mailing list