[cig-commits] r4641 - in short/3D/PyLith/trunk: libsrc/feassemble
unittests/libtests/feassemble
baagaard at geodynamics.org
baagaard at geodynamics.org
Wed Sep 27 20:25:24 PDT 2006
Author: baagaard
Date: 2006-09-27 20:25:24 -0700 (Wed, 27 Sep 2006)
New Revision: 4641
Modified:
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh
Log:
Fixed compilation bugs. Mostly renames (jacbobianTol->minJacobian).
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc 2006-09-28 03:25:24 UTC (rev 4641)
@@ -22,7 +22,7 @@
// ----------------------------------------------------------------------
// Constructor
pylith::feassemble::Quadrature::Quadrature(void) :
- _jacobianTol(0),
+ _minJacobian(0),
_basis(0),
_basisDeriv(0),
_quadPtsRef(0),
@@ -55,7 +55,7 @@
// ----------------------------------------------------------------------
// Copy constructor
pylith::feassemble::Quadrature::Quadrature(const Quadrature& q) :
- _jacobianTol(q._jacobianTol),
+ _minJacobian(q._minJacobian),
_basis(0),
_basisDeriv(0),
_quadPtsRef(0),
@@ -76,7 +76,7 @@
} // if
if (0 != q._basisDeriv) {
- const int size = _numCorners * _numQuadPts * _spaceDim;
+ const int size = _numCorners * _numQuadPts * _cellDim;
_basisDeriv = (size > 0) ? new double[size] : 0;
memcpy(_basisDeriv, q._basisDeriv, size*sizeof(double));
} // if
@@ -160,7 +160,7 @@
for (int i=0; i < size; ++i)
_basis[i] = basis[i];
- size = numCorners * numQuadPts * spaceDim;
+ size = numCorners * numQuadPts * cellDim;
delete[] _basisDeriv; _basisDeriv = (size > 0) ? new double[size] : 0;
for (int i=0; i < size; ++i)
_basisDeriv[i] = basisDeriv[i];
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2006-09-28 03:25:24 UTC (rev 4641)
@@ -57,8 +57,8 @@
const ALE::Mesh::topology_type::patch_type patch = 0;
const ALE::Mesh::section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
- assert(1 == coordinates.GetFiberDimensionByDepth(patch,
- *vertices->begin(), 0));
+ //assert(1 == coordinates.GetFiberDimensionByDepth(patch,
+ //*vertices->begin(), 0));
// Loop over quadrature points
for (int iQuadPt=0; iQuadPt < _numQuadPts; ++iQuadPt) {
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2006-09-28 03:25:24 UTC (rev 4641)
@@ -57,8 +57,8 @@
const ALE::Mesh::topology_type::patch_type patch = 0;
const ALE::Mesh::section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
- assert(2 == coordinates.GetFiberDimensionByDepth(patch,
- *vertices->begin(), 0));
+ //assert(2 == coordinates.GetFiberDimensionByDepth(patch,
+ //*vertices->begin(), 0));
// Loop over quadrature points
for (int iQuadPt=0; iQuadPt < _numQuadPts; ++iQuadPt) {
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2006-09-28 03:25:24 UTC (rev 4641)
@@ -57,8 +57,8 @@
const ALE::Mesh::topology_type::patch_type patch = 0;
const ALE::Mesh::section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
- assert(3 == coordinates.GetFiberDimensionByDepth(patch,
- *vertices->begin(), 0));
+ //assert(3 == coordinates.GetFiberDimensionByDepth(patch,
+ //*vertices->begin(), 0));
// Loop over quadrature points
for (int iQuadPt=0; iQuadPt < _numQuadPts; ++iQuadPt) {
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2006-09-28 03:25:24 UTC (rev 4641)
@@ -57,8 +57,8 @@
const ALE::Mesh::topology_type::patch_type patch = 0;
const ALE::Mesh::section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
- assert(2 == coordinates.GetFiberDimensionByDepth(patch,
- *vertices->begin(), 0));
+ //assert(2 == coordinates.GetFiberDimensionByDepth(patch,
+ //*vertices->begin(), 0));
// Loop over quadrature points
for (int iQuadPt=0; iQuadPt < _numQuadPts; ++iQuadPt) {
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2006-09-28 03:25:24 UTC (rev 4641)
@@ -28,7 +28,7 @@
pylith::feassemble::TestQuadrature::testClone(void)
{ // testClone
// Semi-random values manually set to check cloning
- const double jacobianTol = 1.0;
+ const double minJacobian = 1.0;
const int cellDim = 1;
const int numCorners = 2;
const int numQuadPts = 1;
@@ -44,7 +44,7 @@
// Set values
Quadrature1D qOrig;
- qOrig._jacobianTol = jacobianTol;
+ qOrig._minJacobian = minJacobian;
qOrig._cellDim = cellDim;
qOrig._numCorners = numCorners;
qOrig._numQuadPts = numQuadPts;
@@ -88,7 +88,7 @@
// Check clone
CPPUNIT_ASSERT(0 != qCopy);
- CPPUNIT_ASSERT_EQUAL(jacobianTol, qCopy->_jacobianTol);
+ CPPUNIT_ASSERT_EQUAL(minJacobian, qCopy->_minJacobian);
CPPUNIT_ASSERT_EQUAL(cellDim, qCopy->_cellDim);
CPPUNIT_ASSERT_EQUAL(numCorners, qCopy->_numCorners);
CPPUNIT_ASSERT_EQUAL(numQuadPts, qCopy->_numQuadPts);
@@ -131,15 +131,15 @@
} // testCopy
// ----------------------------------------------------------------------
-// Test jacobianTolerance()
+// Test minJacobian()
void
-pylith::feassemble::TestQuadrature::testJacobianTol(void)
-{ // testJacobianTol
+pylith::feassemble::TestQuadrature::testMinJacobian(void)
+{ // testMinJacobian
Quadrature1D q;
- const double tolerance = 1.0;
- q.jacobianTolerance(tolerance);
- CPPUNIT_ASSERT_EQUAL(tolerance, q._jacobianTol);
-} // testJacobianTol
+ const double min = 1.0;
+ q.minJacobian(min);
+ CPPUNIT_ASSERT_EQUAL(min, q._minJacobian);
+} // testMinJacobian
// ----------------------------------------------------------------------
// Test initialize()
@@ -155,7 +155,7 @@
const double basisDeriv[] = { -0.5, 0.5 };
const double quadPtsRef[] = { 0.0 };
const double quadWts[] = { 2.0 };
- const double jacobianTol = 1.0;
+ const double minJacobian = 1.0;
Quadrature1D q;
q.initialize(basis, basisDeriv, quadPtsRef, quadWts,
@@ -214,7 +214,7 @@
const double* jacobianInv = data.jacobianInv;
const double* jacobianDet = data.jacobianDet;
- const double jacobianTol = 1.0e-06;
+ const double minJacobian = 1.0e-06;
CPPUNIT_ASSERT(0 != basis);
CPPUNIT_ASSERT(0 != basisDeriv);
@@ -227,7 +227,7 @@
CPPUNIT_ASSERT(0 != jacobianInv);
CPPUNIT_ASSERT(0 != jacobianDet);
- pQuad->jacobianTolerance(jacobianTol);
+ pQuad->minJacobian(minJacobian);
pQuad->initialize(basis, basisDeriv, quadPtsRef, quadWts,
cellDim, numCorners, numQuadPts, spaceDim);
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh 2006-09-27 23:59:59 UTC (rev 4640)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh 2006-09-28 03:25:24 UTC (rev 4641)
@@ -39,7 +39,7 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUITE( TestQuadrature );
CPPUNIT_TEST( testClone );
- CPPUNIT_TEST( testJacobianTol );
+ CPPUNIT_TEST( testMinJacobian );
CPPUNIT_TEST( testInitialize );
CPPUNIT_TEST_SUITE_END();
@@ -50,8 +50,8 @@
/// Test clone()
void testClone(void);
- /// Test jacobianTolerance()
- void testJacobianTol(void);
+ /// Test minJacobian()
+ void testMinJacobian(void);
/// Test initialize()
void testInitialize(void);
More information about the cig-commits
mailing list