[cig-commits] r6548 -
short/3D/PyLith/trunk/unittests/pytests/feassemble
brad at geodynamics.org
brad at geodynamics.org
Wed Apr 11 17:55:51 PDT 2007
Author: brad
Date: 2007-04-11 17:55:50 -0700 (Wed, 11 Apr 2007)
New Revision: 6548
Modified:
short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.cc
short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh
short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc
short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src
Log:
Updated to reflect change in Quadrature interface (numCorners->numBasis).
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.cc 2007-04-12 00:47:05 UTC (rev 6547)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.cc 2007-04-12 00:55:50 UTC (rev 6548)
@@ -22,7 +22,7 @@
// Semi-random values manually set to check cloning
const double minJacobian = 1.0;
const int cellDim = 1;
- const int numCorners = 2;
+ const int numBasis = 2;
const int numQuadPts = 1;
const int spaceDim = 1;
const double basis[] = { 0.2, 0.4 };
@@ -38,7 +38,7 @@
Quadrature1D qOrig;
qOrig._minJacobian = minJacobian;
qOrig._cellDim = cellDim;
- qOrig._numCorners = numCorners;
+ qOrig._numBasis = numBasis;
qOrig._numQuadPts = numQuadPts;
qOrig._spaceDim = spaceDim;
@@ -82,17 +82,17 @@
CPPUNIT_ASSERT_EQUAL(minJacobian, qCopy->_minJacobian);
CPPUNIT_ASSERT_EQUAL(cellDim, qCopy->_cellDim);
- CPPUNIT_ASSERT_EQUAL(numCorners, qCopy->_numCorners);
+ CPPUNIT_ASSERT_EQUAL(numBasis, qCopy->_numBasis);
CPPUNIT_ASSERT_EQUAL(numQuadPts, qCopy->_numQuadPts);
CPPUNIT_ASSERT_EQUAL(spaceDim, qCopy->_spaceDim);
CPPUNIT_ASSERT(0 != qCopy->_basis);
- size = numCorners * numQuadPts;
+ size = numBasis * numQuadPts;
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(basis[i], qCopy->_basis[i]);
CPPUNIT_ASSERT(0 != qCopy->_basisDeriv);
- size = numCorners * numQuadPts * spaceDim;
+ size = numBasis * numQuadPts * spaceDim;
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(basisDeriv[i], qCopy->_basisDeriv[i]);
@@ -140,7 +140,7 @@
{ // initialize
const int cellDim = 1;
- const int numCorners = 2;
+ const int numBasis = 2;
const int numQuadPts = 1;
const int spaceDim = 1;
const double basis[] = { 0.5, 0.5 };
@@ -151,18 +151,18 @@
Quadrature1D q;
q.initialize(basis, basisDeriv, quadPtsRef, quadWts,
- cellDim, numCorners, numQuadPts, spaceDim);
+ cellDim, numBasis, numQuadPts, spaceDim);
CPPUNIT_ASSERT_EQUAL(cellDim, q._cellDim);
- CPPUNIT_ASSERT_EQUAL(numCorners, q._numCorners);
+ CPPUNIT_ASSERT_EQUAL(numBasis, q._numBasis);
CPPUNIT_ASSERT_EQUAL(numQuadPts, q._numQuadPts);
CPPUNIT_ASSERT_EQUAL(spaceDim, q._spaceDim);
- int size = numCorners * numQuadPts;
+ int size = numBasis * numQuadPts;
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(basis[i], q._basis[i]);
- size = numCorners * numQuadPts * spaceDim;
+ size = numBasis * numQuadPts * spaceDim;
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(basisDeriv[i], q._basisDeriv[i]);
@@ -189,7 +189,7 @@
const QuadratureData& data) const
{ // testComputeGeometry
const int cellDim = data.cellDim;
- const int numCorners = data.numCorners;
+ const int numBasis = data.numBasis;
const int numQuadPts = data.numQuadPts;
const int spaceDim = data.spaceDim;
const double* basis = data.basis;
@@ -221,7 +221,7 @@
pQuad->minJacobian(minJacobian);
pQuad->initialize(basis, basisDeriv, quadPtsRef, quadWts,
- cellDim, numCorners, numQuadPts, spaceDim);
+ cellDim, numBasis, numQuadPts, spaceDim);
// Create mesh with test cell
typedef ALE::Field::Mesh mesh;
@@ -231,7 +231,7 @@
const bool interpolate = false;
ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
- (int*) cells, numVertices, interpolate, numCorners);
+ (int*) cells, numVertices, interpolate, numBasis);
mesh->setSieve(sieve);
mesh->stratify();
ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh 2007-04-12 00:47:05 UTC (rev 6547)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh 2007-04-12 00:55:50 UTC (rev 6548)
@@ -47,7 +47,7 @@
*
* @returns Number of vertices
*/
- static int numCorners(const Quadrature& q);
+ static int numBasis(const Quadrature& q);
/** Get number of quadrature points.
*
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc 2007-04-12 00:47:05 UTC (rev 6547)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc 2007-04-12 00:55:50 UTC (rev 6548)
@@ -22,8 +22,8 @@
// Get number of vertices in cell.
int
-pylith::feassemble::TestQuadrature::numCorners(const Quadrature& q) {
- return q._numCorners;
+pylith::feassemble::TestQuadrature::numBasis(const Quadrature& q) {
+ return q._numBasis;
}
// Get number of quadrature points.
@@ -41,25 +41,25 @@
// Get basis functions evaluated at quadrature points.
const double*
pylith::feassemble::TestQuadrature::basis(const Quadrature& q) {
- return q._basis;
+ return &q._basis[0];
}
// Get derivatives of basis functions evaluated at quadrature points.
const double*
pylith::feassemble::TestQuadrature::basisDeriv(const Quadrature& q) {
- return q._basisDeriv;
+ return &q._basisDeriv[0];
}
// Get coordinates of quadrature points
const double*
pylith::feassemble::TestQuadrature::quadPtsRef(const Quadrature& q) {
- return q._quadPtsRef;
+ return &q._quadPtsRef[0];
}
// Get weights of quadrature points
const double*
pylith::feassemble::TestQuadrature::quadWts(const Quadrature& q) {
- return q._quadWts;
+ return &q._quadWts[0];
}
#endif
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src 2007-04-12 00:47:05 UTC (rev 6547)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src 2007-04-12 00:55:50 UTC (rev 6548)
@@ -38,11 +38,11 @@
return pylith::feassemble::TestQuadrature::cellDim(*q);
#}embed
-# create shim for TestQuadrature::numCorners
-#embed{ int TestQuadrature_numCorners(void* obj)
+# create shim for TestQuadrature::numBasis
+#embed{ int TestQuadrature_numBasis(void* obj)
const pylith::feassemble::Quadrature* q =
(pylith::feassemble::Quadrature*) obj;
-return pylith::feassemble::TestQuadrature::numCorners(*q);
+return pylith::feassemble::TestQuadrature::numBasis(*q);
#}embed
# create shim for TestQuadrature::numQuadPts
@@ -64,7 +64,7 @@
const pylith::feassemble::Quadrature* q =
(pylith::feassemble::Quadrature*) obj;
const int size = TestQuadrature_numQuadPts(obj) *
- TestQuadrature_numCorners(obj);
+ TestQuadrature_numBasis(obj);
double* vals = (size > 0) ? new double[size] : 0;
const double* basis = pylith::feassemble::TestQuadrature::basis(*q);
memcpy(vals, basis, size*sizeof(double));
@@ -76,7 +76,7 @@
const pylith::feassemble::Quadrature* q =
(pylith::feassemble::Quadrature*) obj;
const int size = TestQuadrature_numQuadPts(obj) *
- TestQuadrature_numCorners(obj) *
+ TestQuadrature_numBasis(obj) *
TestQuadrature_cellDim(obj);
double* vals = (size > 0) ? new double[size] : 0;
const double* basisDeriv = pylith::feassemble::TestQuadrature::basisDeriv(*q);
@@ -120,13 +120,13 @@
qptr = ptrFromHandle(qhandle)
cdef int numQuadPts
- cdef int numCorners
+ cdef int numBasis
numQuadPts = TestQuadrature_numQuadPts(qptr)
- numCorners = TestQuadrature_numCorners(qptr)
+ numBasis = TestQuadrature_numBasis(qptr)
cdef double* values
values = TestQuadrature_basis(qptr)
- dims = [numQuadPts, numCorners]
+ dims = [numQuadPts, numBasis]
valuesObj = PyCObject_FromVoidPtr(values, NULL)
return spatialdata.utils.simplearray.SimpleCppArray(valuesObj, dims, "double")
@@ -144,15 +144,15 @@
qptr = ptrFromHandle(qhandle)
cdef int numQuadPts
- cdef int numCorners
+ cdef int numBasis
cdef int cellDim
numQuadPts = TestQuadrature_numQuadPts(qptr)
- numCorners = TestQuadrature_numCorners(qptr)
+ numBasis = TestQuadrature_numBasis(qptr)
cellDim = TestQuadrature_cellDim(qptr)
cdef double* values
values = TestQuadrature_basisDeriv(qptr)
- dims = [numQuadPts, numCorners, cellDim]
+ dims = [numQuadPts, numBasis, cellDim]
valuesObj = PyCObject_FromVoidPtr(values, NULL)
return spatialdata.utils.simplearray.SimpleCppArray(valuesObj, dims,
"double")
More information about the cig-commits
mailing list