[cig-commits] r6857 - in short/3D/PyLith/trunk: doc libsrc/faults
libsrc/feassemble libsrc/materials modulesrc/feassemble
pylith/feassemble pylith/feassemble/quadrature
unittests/libtests/faults unittests/libtests/feassemble
unittests/libtests/feassemble/data
unittests/libtests/materials unittests/pytests/feassemble
brad at geodynamics.org
brad at geodynamics.org
Fri May 11 16:07:44 PDT 2007
Author: brad
Date: 2007-05-11 16:07:43 -0700 (Fri, 11 May 2007)
New Revision: 6857
Modified:
short/3D/PyLith/trunk/doc/PyLith.vpp
short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
short/3D/PyLith/trunk/libsrc/feassemble/ExplicitElasticity.cc
short/3D/PyLith/trunk/libsrc/feassemble/ImplicitElasticity.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh
short/3D/PyLith/trunk/libsrc/materials/Material.cc
short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
short/3D/PyLith/trunk/pylith/feassemble/FIATCell.py
short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py
short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py
short/3D/PyLith/trunk/pylith/feassemble/quadrature/Quadrature.py
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din2D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din3D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2Din3D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature3D.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.hh
short/3D/PyLith/trunk/unittests/libtests/feassemble/data/feutils.py
short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
short/3D/PyLith/trunk/unittests/pytests/feassemble/TestFIATSimplex.py
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/TestQuadrature.py
short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src
Log:
Removed stuff from Quadrature related to basis functions at vertices. Computing geometry of faces, etc will be implemented in topology stuff.
Modified: short/3D/PyLith/trunk/doc/PyLith.vpp
===================================================================
(Binary files differ)
Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -116,12 +116,11 @@
for (Mesh::label_sequence::iterator c_iter=cBegin;
c_iter != cEnd;
++c_iter) {
- // Compute cell geometry at vertices
- _quadrature->computeGeometryVert(*_faultMesh, coordinates, *c_iter);
+ // Compute Jacobian at vertices
+ // STUFF GOES HERE
+ double_array jacobian;
+ double_array jacobianDet;
- const double_array& jacobian = _quadrature->jacobianVert();
- const double_array& jacobianDet = _quadrature->jacobianDetVert();
-
// Compute weighted orientation of face at vertices (using geometry info)
orientFn(&cellOrientation, jacobian, jacobianDet, upDir, numVertices);
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ExplicitElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ExplicitElasticity.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ExplicitElasticity.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -130,7 +130,7 @@
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
- _quadrature->computeGeometryQuad(mesh, coordinates, *cellIter);
+ _quadrature->computeGeometry(mesh, coordinates, *cellIter);
// Set cell data in material
_material->initCellData(*cellIter, numQuadPts);
@@ -145,9 +145,9 @@
mesh->restrict(dispTmdt, *cellIter);
// Get cell geometry information that depends on cell
- const double_array& basis = _quadrature->basisQuad();
- const double_array& basisDeriv = _quadrature->basisDerivQuad();
- const double_array& jacobianDet = _quadrature->jacobianDetQuad();
+ const double_array& basis = _quadrature->basis();
+ const double_array& basisDeriv = _quadrature->basisDeriv();
+ const double_array& jacobianDet = _quadrature->jacobianDet();
// Compute action for cell
@@ -298,7 +298,7 @@
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
- _quadrature->computeGeometryQuad(mesh, coordinates, *cellIter);
+ _quadrature->computeGeometry(mesh, coordinates, *cellIter);
// Set cell data in material
_material->initCellData(*cellIter, numQuadPts);
@@ -307,8 +307,8 @@
_resetCellMatrix();
// Get cell geometry information that depends on cell
- const double_array& basis = _quadrature->basisQuad();
- const double_array& jacobianDet = _quadrature->jacobianDetQuad();
+ const double_array& basis = _quadrature->basis();
+ const double_array& jacobianDet = _quadrature->jacobianDet();
// Get material physical properties at quadrature points for this cell
const std::vector<double_array>& density = _material->calcDensity();
Modified: short/3D/PyLith/trunk/libsrc/feassemble/ImplicitElasticity.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ImplicitElasticity.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ImplicitElasticity.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -106,7 +106,7 @@
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
- _quadrature->computeGeometryQuad(mesh, coordinates, *cellIter);
+ _quadrature->computeGeometry(mesh, coordinates, *cellIter);
// Set cell data in material
_material->initCellData(*cellIter, numQuadPts);
@@ -115,8 +115,8 @@
_resetCellVector();
// Get cell geometry information that depends on cell
- const double_array& basis = _quadrature->basisQuad();
- const double_array& jacobianDet = _quadrature->jacobianDetQuad();
+ const double_array& basis = _quadrature->basis();
+ const double_array& jacobianDet = _quadrature->jacobianDet();
// Get density at quadrature points for this cell
const std::vector<double_array>& density = _material->calcDensity();
@@ -205,7 +205,7 @@
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
- _quadrature->computeGeometryQuad(mesh, coordinates, *cellIter);
+ _quadrature->computeGeometry(mesh, coordinates, *cellIter);
// Set cell data in material
_material->initCellData(*cellIter, numQuadPts);
@@ -218,9 +218,9 @@
mesh->restrict(dispT, *cellIter);
// Get cell geometry information that depends on cell
- const double_array& basis = _quadrature->basisQuad();
- const double_array& basisDeriv = _quadrature->basisDerivQuad();
- const double_array& jacobianDet = _quadrature->jacobianDetQuad();
+ const double_array& basis = _quadrature->basis();
+ const double_array& basisDeriv = _quadrature->basisDeriv();
+ const double_array& jacobianDet = _quadrature->jacobianDet();
if (cellDim != spaceDim)
throw std::logic_error("Not implemented yet.");
@@ -374,7 +374,7 @@
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
- _quadrature->computeGeometryQuad(mesh, coordinates, *cellIter);
+ _quadrature->computeGeometry(mesh, coordinates, *cellIter);
// Set cell data in material
_material->initCellData(*cellIter, numQuadPts);
@@ -387,9 +387,9 @@
mesh->restrict(dispT, *cellIter);
// Get cell geometry information that depends on cell
- const double_array& basis = _quadrature->basisQuad();
- const double_array& basisDeriv = _quadrature->basisDerivQuad();
- const double_array& jacobianDet = _quadrature->jacobianDetQuad();
+ const double_array& basis = _quadrature->basis();
+ const double_array& basisDeriv = _quadrature->basisDeriv();
+ const double_array& jacobianDet = _quadrature->jacobianDet();
// 1D Case
if (1 == cellDim) {
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -43,15 +43,11 @@
_quadPtsRef(q._quadPtsRef),
_quadPts(q._quadPts),
_quadWts(q._quadWts),
- _basisVert(q._basisVert),
- _basisDerivVert(q._basisDerivVert),
- _jacobianVert(q._jacobianVert),
- _jacobianDetVert(q._jacobianDetVert),
- _basisQuad(q._basisQuad),
- _basisDerivQuad(q._basisDerivQuad),
- _jacobianQuad(q._jacobianQuad),
- _jacobianInvQuad(q._jacobianInvQuad),
- _jacobianDetQuad(q._jacobianDetQuad),
+ _basis(q._basis),
+ _basisDeriv(q._basisDeriv),
+ _jacobian(q._jacobian),
+ _jacobianInv(q._jacobianInv),
+ _jacobianDet(q._jacobianDet),
_cellDim(q._cellDim),
_numBasis(q._numBasis),
_numQuadPts(q._numQuadPts),
@@ -63,10 +59,8 @@
// Set basis functions and their derivatives and coordinates and
// weights of the quadrature points.
void
-pylith::feassemble::Quadrature::initialize(const double* basisVert,
- const double* basisDerivVert,
- const double* basisQuad,
- const double* basisDerivQuad,
+pylith::feassemble::Quadrature::initialize(const double* basis,
+ const double* basisDeriv,
const double* quadPtsRef,
const double* quadWts,
const int cellDim,
@@ -74,10 +68,8 @@
const int numQuadPts,
const int spaceDim)
{ // initialize
- if (0 == basisVert ||
- 0 == basisDerivVert ||
- 0 == basisQuad ||
- 0 == basisDerivQuad ||
+ if (0 == basis ||
+ 0 == basisDeriv ||
0 == quadPtsRef ||
0 == quadWts ||
cellDim < 1 || cellDim > 3 ||
@@ -89,10 +81,8 @@
<< "their derivatives, and coordinates and weights of quadrature\n"
<< "points must all be specified.\n"
<< "Values:\n"
- << " basis pointer (vertices): " << basisVert << "\n"
- << " basis derivatites pointer (vertices): " << basisDerivVert << "\n"
- << " basis pointer (quad pts): " << basisQuad << "\n"
- << " basis derivatites pointer (quad pts): " << basisDerivQuad << "\n"
+ << " basis pointer (quad pts): " << basis << "\n"
+ << " basis derivatites pointer (quad pts): " << basisDeriv << "\n"
<< " quadrature points pointer: " << quadPtsRef << "\n"
<< " quadrature weights pointer: " << quadWts << "\n"
<< " space dimension: " << spaceDim << "\n"
@@ -101,27 +91,16 @@
<< " dimension of coordinate space: " << spaceDim << "\n";
throw std::runtime_error(msg.str());
} // if
- const int numVertices = numBasis;
- int size = numBasis * numVertices;
- _basisVert.resize(size);
+ int size = numBasis * numQuadPts;
+ _basis.resize(size);
for (int i=0; i < size; ++i)
- _basisVert[i] = basisVert[i];
+ _basis[i] = basis[i];
- size = numBasis * numVertices * cellDim;
- _basisDerivVert.resize(size);
- for (int i=0; i < size; ++i)
- _basisDerivVert[i] = basisDerivVert[i];
-
- size = numBasis * numQuadPts;
- _basisQuad.resize(size);
- for (int i=0; i < size; ++i)
- _basisQuad[i] = basisQuad[i];
-
size = numBasis * numQuadPts * cellDim;
- _basisDerivQuad.resize(size);
+ _basisDeriv.resize(size);
for (int i=0; i < size; ++i)
- _basisDerivQuad[i] = basisDerivQuad[i];
+ _basisDeriv[i] = basisDeriv[i];
size = numQuadPts * cellDim;
_quadPtsRef.resize(size);
@@ -139,19 +118,13 @@
_spaceDim = spaceDim;
// Allocate for Jacobian and its inverse
- size = numVertices * cellDim * spaceDim;
- _jacobianVert.resize(size);
-
size = numQuadPts * cellDim * spaceDim;
- _jacobianQuad.resize(size);
- _jacobianInvQuad.resize(size);
+ _jacobian.resize(size);
+ _jacobianInv.resize(size);
// Allocate for Jacobian determinant
- size = numVertices;
- _jacobianDetVert.resize(size);
-
size = numQuadPts;
- _jacobianDetQuad.resize(size);
+ _jacobianDet.resize(size);
// Allocate for quad pts
size = numQuadPts*spaceDim;
@@ -163,11 +136,9 @@
void
pylith::feassemble::Quadrature::_resetGeometry(void)
{ // _resetGeometry
- _jacobianVert = 0.0;
- _jacobianDetVert = 0.0;
- _jacobianQuad = 0.0;
- _jacobianDetQuad = 0.0;
- _jacobianInvQuad = 0.0;
+ _jacobian = 0.0;
+ _jacobianDet = 0.0;
+ _jacobianInv = 0.0;
_quadPts = 0.0;
} // _resetGeometry
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -61,21 +61,6 @@
/** Set basis functions and their derivatives, and coordinates and
* weights of the quadrature points.
*
- * @param basis Array of basis functions evaluated at vertices
- * N0Qp0, N1Qp0, ...
- * N0Qp1, N1Qp1, ...
- * ...
- * size = numVertices * numBasis
- * index = iVertex*numBasis + iBasis
- *
- * @param basisDeriv Array of basis function derivaties evaluated
- * at quadrature pts
- * N0xQp0, N0yQp0, N0zQp0, N1xQp0, N1yQp0, N1zQp0, ...
- * N0xQp1, N0yQp1, N0zQp1, N1xQp1, N1yQp1, N1zQp1, ...
- * ...
- * size = numVertices * numBasis * cellDim
- * index = iVertex*numBasis*cellDim + iBasis*cellDim + iDim
- *
* @param basis Array of basis functions evaluated at quadrature pts
* N0Qp0, N1Qp0, ...
* N0Qp1, N1Qp1, ...
@@ -107,10 +92,8 @@
* @param numQuadPts Number of quadrature points
* @param spaceDim Number of dimensions in coordinates of cell vertices
*/
- void initialize(const double* basisVert,
- const double* basisDerivVert,
- const double* basisQuad,
- const double* basisDerivQuad,
+ void initialize(const double* basis,
+ const double* basisDeriv,
const double* quadPtsRef,
const double* quadWts,
const int cellDim,
@@ -142,60 +125,36 @@
*/
const double_array& quadWts(void) const;
- /** Get basis fns evaluated at vertices.
- *
- * @returns Array of basis fns evaluated at vertices
- */
- const double_array& basisVert(void) const;
-
- /** Get derivatives of basis fns evaluated at vertices.
- *
- * @returns Array of derivatives of basis fns evaluated at vertices
- */
- const double_array& basisDerivVert(void) const;
-
- /** Get Jacobians evaluated at vertices.
- *
- * @returns Array of Jacobian inverses evaluated at vertices.
- */
- const double_array& jacobianVert(void) const;
-
- /** Get determinants of Jacobian evaluated at vertices.
- *
- * @returns Array of determinants of Jacobian evaluated at vertices
- */
- const double_array& jacobianDetVert(void) const;
-
/** Get basis fns evaluated at quadrature points.
*
* @returns Array of basis fns evaluated at quadrature points
*/
- const double_array& basisQuad(void) const;
+ const double_array& basis(void) const;
/** Get derivatives of basis fns evaluated at quadrature points.
*
* @returns Array of derivatives of basis fns evaluated at
* quadrature points
*/
- const double_array& basisDerivQuad(void) const;
+ const double_array& basisDeriv(void) const;
/** Get Jacobians evaluated at quadrature points.
*
* @returns Array of Jacobian inverses evaluated at quadrature points.
*/
- const double_array& jacobianQuad(void) const;
+ const double_array& jacobian(void) const;
/** Get determinants of Jacobian evaluated at quadrature points.
*
* @returns Array of determinants of Jacobian evaluated at quadrature pts
*/
- const double_array& jacobianDetQuad(void) const;
+ const double_array& jacobianDet(void) const;
/** Get Jacobian inverses evaluated at quadrature points.
*
* @returns Array of Jacobian inverses evaluated at quadrature points.
*/
- const double_array& jacobianInvQuad(void) const;
+ const double_array& jacobianInv(void) const;
/** Get number of dimensions in reference cell.
*
@@ -221,17 +180,6 @@
*/
int spaceDim(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- virtual
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell) = 0;
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
@@ -239,9 +187,9 @@
* @param cell Finite-element cell
*/
virtual
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell) = 0;
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell) = 0;
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
@@ -298,46 +246,6 @@
*/
double_array _quadWts;
- /** Array of basis functions evaluated at the vertices.
- *
- * N0Qp0, N1Qp0, ...
- * N0Qp1, N1Qp1, ...
- *
- * size = numVertices * numBasis
- * index = iVertex*numBasis + iBasis
- */
- double_array _basisVert;
-
- /** Array of basis function derivatives evaluated at the vertices.
- *
- * N0xQp0, N0yQp0, N0zQp0, N1xQp0, N1yQp0, N1zQp0, ...
- * N0xQp1, N0yQp1, N0zQp1, N1xQp1, N1yQp1, N1zQp1, ...
- *
- * size = numVertices * numBasis * cellDim
- * index = iVertex*numBasis*cellDim + iBasis*cellDim + iDim
- */
- double_array _basisDerivVert;
-
- /** Array of Jacobians evaluated at vertices.
- *
- * Qp0J00, Qp0J01, Qp0J02, ...
- * Qp1J00, Qp1J01, Qp1J02, ...
- * ...
- *
- * size = numVertices*cellDim*spaceDim
- * index = iVertex*cellDim*spaceDim + iRow*spaceDim + iCol
- */
- double_array _jacobianVert;
-
- /** Array of determinant of Jacobian evaluated at vertices.
- *
- * JdetQp0, JdetQp1, ...
- *
- * size = numVertices
- * index = iVertex
- */
- double_array _jacobianDetVert;
-
/** Array of basis functions evaluated at the quadrature points.
*
* N0Qp0, N1Qp0, ...
@@ -346,7 +254,7 @@
* size = numQuadPts * numBasis
* index = iQuadPt*numBasis + iBasis
*/
- double_array _basisQuad;
+ double_array _basis;
/** Array of basis function derivatives evaluated at the quadrature points.
*
@@ -356,7 +264,7 @@
* size = numQuadPts * numBasis * cellDim
* index = iQuadPt*numBasis*cellDim + iBasis*cellDim + iDim
*/
- double_array _basisDerivQuad;
+ double_array _basisDeriv;
/** Array of Jacobians evaluated at quadrature points.
*
@@ -367,7 +275,7 @@
* size = numQuadPts*cellDim*spaceDim
* index = iQuadPt*cellDim*spaceDim + iRow*spaceDim + iCol
*/
- double_array _jacobianQuad;
+ double_array _jacobian;
/** Array of determinant of Jacobian evaluated at quadrature points.
*
@@ -376,7 +284,7 @@
* size = numQuadPts
* index = iQuadPt
*/
- double_array _jacobianDetQuad;
+ double_array _jacobianDet;
/** Array of Jacobian inverses evaluated at quadrature points.
*
@@ -387,7 +295,7 @@
* size = numQuadPts*spaceDim*cellDim
* index = iQuadPt*spaceDim*cellDim + iRow*cellDim + iCol
*/
- double_array _jacobianInvQuad;
+ double_array _jacobianInv;
int _cellDim; ///< Number of dimensions in reference cell
int _numBasis; ///< Number of basis functions (and vertices) for cell
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.icc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -42,67 +42,39 @@
return _quadWts;
}
-// Get basis fns evaluated at vertices.
-inline
-const pylith::double_array&
-pylith::feassemble::Quadrature::basisVert(void) const {
- return _basisVert;
-}
-
-// Get derivatives of basis fns evaluated at vertices.
-inline
-const pylith::double_array&
-pylith::feassemble::Quadrature::basisDerivVert(void) const {
- return _basisDerivVert;
-}
-
-// Get Jacobians evaluated at vertices.
-inline
-const pylith::double_array&
-pylith::feassemble::Quadrature::jacobianVert(void) const {
- return _jacobianVert;
-}
-
-// Get determinants of Jacobian evaluated at vertices.
-inline
-const pylith::double_array&
-pylith::feassemble::Quadrature::jacobianDetVert(void) const {
- return _jacobianDetVert;
-}
-
// Get basis fns evaluated at quadrature points.
inline
const pylith::double_array&
-pylith::feassemble::Quadrature::basisQuad(void) const {
- return _basisQuad;
+pylith::feassemble::Quadrature::basis(void) const {
+ return _basis;
}
// Get derivatives of basis fns evaluated at quadrature points.
inline
const pylith::double_array&
-pylith::feassemble::Quadrature::basisDerivQuad(void) const {
- return _basisDerivQuad;
+pylith::feassemble::Quadrature::basisDeriv(void) const {
+ return _basisDeriv;
}
// Get Jacobians evaluated at quadrature points.
inline
const pylith::double_array&
-pylith::feassemble::Quadrature::jacobianQuad(void) const {
- return _jacobianQuad;
+pylith::feassemble::Quadrature::jacobian(void) const {
+ return _jacobian;
}
// Get determinants of Jacobian evaluated at quadrature points.
inline
const pylith::double_array&
-pylith::feassemble::Quadrature::jacobianDetQuad(void) const {
- return _jacobianDetQuad;
+pylith::feassemble::Quadrature::jacobianDet(void) const {
+ return _jacobianDet;
}
// Get Jacobian inverses evaluated at quadrature points.
inline
const pylith::double_array&
-pylith::feassemble::Quadrature::jacobianInvQuad(void) const {
- return _jacobianInvQuad;
+pylith::feassemble::Quadrature::jacobianInv(void) const {
+ return _jacobianInv;
}
// Get number of dimensions in reference cell.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,50 +38,13 @@
} // copy constructor
// ----------------------------------------------------------------------
-// Compute geometric quantities for a cell at vertoces.
-void
-pylith::feassemble::Quadrature1D::computeGeometryVert(
- const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell)
-{ // computeGeometryVert
- assert(1 == _cellDim);
- assert(1 == _spaceDim);
-
- _resetGeometry();
-
- // Get coordinates of cell's vertices
- const real_section_type::value_type* vertCoords =
- mesh->restrict(coordinates, cell);
- assert(1 == coordinates->getFiberDimension(*mesh->depthStratum(0)->begin()));
-
- // Loop over vertices
- const int numVertices = _numBasis;
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
-
- // Compute Jacobian at vertices
- // J = dx/dp = sum[i=0,n-1] (dNi/dp * xi)
- for (int iBasis=0; iBasis < _numBasis; ++iBasis)
- _jacobianVert[iVertex] +=
- _basisDerivVert[iVertex*_numBasis+iBasis] * vertCoords[iBasis];
-
- // Compute determinant of Jacobian at vertices
- // |J| = j00
- const double det = _jacobianVert[iVertex];
- _checkJacobianDet(det);
- _jacobianDetVert[iVertex] = _jacobianVert[iVertex];
- } // for
-
-} // computeGeometryVert
-
-// ----------------------------------------------------------------------
// Compute geometric quantities for a cell at quadrature points.
void
-pylith::feassemble::Quadrature1D::computeGeometryQuad(
+pylith::feassemble::Quadrature1D::computeGeometry(
const ALE::Obj<Mesh>& mesh,
const ALE::Obj<real_section_type>& coordinates,
const Mesh::point_type& cell)
-{ // computeGeometryQuad
+{ // computeGeometry
assert(1 == _cellDim);
assert(1 == _spaceDim);
@@ -99,25 +62,25 @@
// x = sum[i=0,n-1] (Ni * xi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis)
_quadPts[iQuadPt] +=
- _basisQuad[iQuadPt*_numBasis+iBasis]*vertCoords[iBasis];
+ _basis[iQuadPt*_numBasis+iBasis]*vertCoords[iBasis];
// Compute Jacobian at quadrature point
// J = dx/dp = sum[i=0,n-1] (dNi/dp * xi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis)
- _jacobianQuad[iQuadPt] +=
- _basisDerivQuad[iQuadPt*_numBasis+iBasis] * vertCoords[iBasis];
+ _jacobian[iQuadPt] +=
+ _basisDeriv[iQuadPt*_numBasis+iBasis] * vertCoords[iBasis];
// Compute determinant of Jacobian at quadrature point
// |J| = j00
- const double det = _jacobianQuad[iQuadPt];
+ const double det = _jacobian[iQuadPt];
_checkJacobianDet(det);
- _jacobianDetQuad[iQuadPt] = _jacobianQuad[iQuadPt];
+ _jacobianDet[iQuadPt] = _jacobian[iQuadPt];
// Compute inverse of Jacobian at quadrature point
// Jinv = 1/j00
- _jacobianInvQuad[iQuadPt] = 1.0/_jacobianDetQuad[iQuadPt];
+ _jacobianInv[iQuadPt] = 1.0/_jacobianDet[iQuadPt];
} // for
-} // computeGeometryQuad
+} // computeGeometry
// End of file
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,25 +44,15 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -36,59 +36,13 @@
} // copy constructor
// ----------------------------------------------------------------------
-// Compute geometric quantities for a cell at vertices.
-void
-pylith::feassemble::Quadrature1Din2D::computeGeometryVert(
- const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell)
-{ // computeGeometryVert
- assert(1 == _cellDim);
- assert(2 == _spaceDim);
-
- _resetGeometry();
-
- // Get coordinates of cell's vertices
- const real_section_type::value_type* vertCoords =
- mesh->restrict(coordinates, cell);
- assert(2 == coordinates->getFiberDimension(*mesh->depthStratum(0)->begin()));
-
- // Loop over vertices
- const int numVertices = _numBasis;
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
-
- // Compute Jacobian at vertex
- // J = [dx/dp dy/dp]
- // dx/dp = sum[i=0,n-1] (dNi/dp * xi)
- // dy/dp = sum[i=0,n-1] (dNi/dp * yi)
- for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double deriv = _basisDerivVert[iVertex*_numBasis+iBasis];
- for (int iDim=0; iDim < _spaceDim; ++iDim)
- _jacobianVert[iVertex*_spaceDim+iDim] +=
- deriv * vertCoords[iBasis*_spaceDim+iDim];
- } // for
-
- // Compute determinant of Jacobian at vertex
- // |J| = sqrt(J transpose(J))
- double det = 0.0;
- for (int iDim=0; iDim < _spaceDim; ++iDim)
- det += _jacobianVert[iVertex*_spaceDim+iDim] *
- _jacobianVert[iVertex*_spaceDim+iDim];
- det = sqrt(det);
- _checkJacobianDet(det);
- _jacobianDetVert[iVertex] = det;
- } // for
-
-} // computeGeometryVert
-
-// ----------------------------------------------------------------------
// Compute geometric quantities for a cell at quadrature points.
void
-pylith::feassemble::Quadrature1Din2D::computeGeometryQuad(
+pylith::feassemble::Quadrature1Din2D::computeGeometry(
const ALE::Obj<Mesh>& mesh,
const ALE::Obj<real_section_type>& coordinates,
const Mesh::point_type& cell)
-{ // computeGeometryQuad
+{ // computeGeometry
assert(1 == _cellDim);
assert(2 == _spaceDim);
@@ -106,7 +60,7 @@
// x = sum[i=0,n-1] (Ni * xi)
// y = sum[i=0,n-1] (Ni * yi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double basis = _basisQuad[iQuadPt*_numBasis+iBasis];
+ const double basis = _basis[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
_quadPts[iQuadPt*_spaceDim+iDim] +=
basis * vertCoords[iBasis*_spaceDim+iDim];
@@ -117,9 +71,9 @@
// dx/dp = sum[i=0,n-1] (dNi/dp * xi)
// dy/dp = sum[i=0,n-1] (dNi/dp * yi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double deriv = _basisDerivQuad[iQuadPt*_numBasis+iBasis];
+ const double deriv = _basisDeriv[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
- _jacobianQuad[iQuadPt*_spaceDim+iDim] +=
+ _jacobian[iQuadPt*_spaceDim+iDim] +=
deriv * vertCoords[iBasis*_spaceDim+iDim];
} // for
@@ -127,19 +81,19 @@
// |J| = sqrt(J transpose(J))
double det = 0.0;
for (int iDim=0; iDim < _spaceDim; ++iDim)
- det += _jacobianQuad[iQuadPt*_spaceDim+iDim] *
- _jacobianQuad[iQuadPt*_spaceDim+iDim];
+ det += _jacobian[iQuadPt*_spaceDim+iDim] *
+ _jacobian[iQuadPt*_spaceDim+iDim];
det = sqrt(det);
_checkJacobianDet(det);
- _jacobianDetQuad[iQuadPt] = det;
+ _jacobianDet[iQuadPt] = det;
// Compute inverse of Jacobian at quadrature point
// Jinv = 1.0/[J]
for (int iDim=0; iDim < _spaceDim; ++iDim)
- _jacobianInvQuad[iQuadPt*_spaceDim+iDim] =
- 1.0 / _jacobianQuad[iQuadPt*_spaceDim+iDim];
+ _jacobianInv[iQuadPt*_spaceDim+iDim] =
+ 1.0 / _jacobian[iQuadPt*_spaceDim+iDim];
} // for
-} // computeGeometryQuad
+} // computeGeometry
// End of file
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,25 +44,15 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -36,59 +36,13 @@
} // copy constructor
// ----------------------------------------------------------------------
-// Compute geometric quantities for a cell at vertices.
-void
-pylith::feassemble::Quadrature1Din3D::computeGeometryVert(
- const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell)
-{ // computeGeometryVert
- assert(1 == _cellDim);
- assert(3 == _spaceDim);
-
- _resetGeometry();
-
- // Get coordinates of cell's vertices
- const real_section_type::value_type* vertCoords =
- mesh->restrict(coordinates, cell);
- assert(3 == coordinates->getFiberDimension(*mesh->depthStratum(0)->begin()));
-
- // Loop over vertices
- const int numVertices = _numBasis;
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
- // Compute Jacobian at vertex
- // J = [dx/dp dy/dp dz/dp]
- // dx/dp = sum[i=0,n-1] (dNi/dp * xi)
- // dy/dp = sum[i=0,n-1] (dNi/dp * yi)
- // dz/dp = sum[i=0,n-1] (dNi/dp * zi)
- for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double deriv = _basisDerivVert[iVertex*_numBasis+iBasis];
- for (int iDim=0; iDim < _spaceDim; ++iDim)
- _jacobianVert[iVertex*_spaceDim+iDim] +=
- deriv * vertCoords[iBasis*_spaceDim+iDim];
- } // for
-
- // Compute determinant of Jacobian at quadrature point
- // |J| = sqrt(J transpose(J))
- double det = 0.0;
- for (int iDim=0; iDim < _spaceDim; ++iDim)
- det += _jacobianVert[iVertex*_spaceDim+iDim] *
- _jacobianVert[iVertex*_spaceDim+iDim];
- det = sqrt(det);
- _checkJacobianDet(det);
- _jacobianDetVert[iVertex] = det;
- } // for
-
-} // computeGeometryVert
-
-// ----------------------------------------------------------------------
// Compute geometric quantities for a cell at quadrature points.
void
-pylith::feassemble::Quadrature1Din3D::computeGeometryQuad(
+pylith::feassemble::Quadrature1Din3D::computeGeometry(
const ALE::Obj<Mesh>& mesh,
const ALE::Obj<real_section_type>& coordinates,
const Mesh::point_type& cell)
-{ // computeGeometryQuad
+{ // computeGeometry
assert(1 == _cellDim);
assert(3 == _spaceDim);
@@ -107,7 +61,7 @@
// y = sum[i=0,n-1] (Ni * yi)
// z = sum[i=0,n-1] (Ni * zi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double basis = _basisQuad[iQuadPt*_numBasis+iBasis];
+ const double basis = _basis[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
_quadPts[iQuadPt*_spaceDim+iDim] +=
basis * vertCoords[iBasis*_spaceDim+iDim];
@@ -119,9 +73,9 @@
// dy/dp = sum[i=0,n-1] (dNi/dp * yi)
// dz/dp = sum[i=0,n-1] (dNi/dp * zi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double deriv = _basisDerivQuad[iQuadPt*_numBasis+iBasis];
+ const double deriv = _basisDeriv[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
- _jacobianQuad[iQuadPt*_spaceDim+iDim] +=
+ _jacobian[iQuadPt*_spaceDim+iDim] +=
deriv * vertCoords[iBasis*_spaceDim+iDim];
} // for
@@ -129,19 +83,19 @@
// |J| = sqrt(J transpose(J))
double det = 0.0;
for (int iDim=0; iDim < _spaceDim; ++iDim)
- det += _jacobianQuad[iQuadPt*_spaceDim+iDim] *
- _jacobianQuad[iQuadPt*_spaceDim+iDim];
+ det += _jacobian[iQuadPt*_spaceDim+iDim] *
+ _jacobian[iQuadPt*_spaceDim+iDim];
det = sqrt(det);
_checkJacobianDet(det);
- _jacobianDetQuad[iQuadPt] = det;
+ _jacobianDet[iQuadPt] = det;
// Compute inverse of Jacobian at quadrature point
// Jinv = 1.0/[J]
for (int iDim=0; iDim < _spaceDim; ++iDim)
- _jacobianInvQuad[iQuadPt*_spaceDim+iDim] =
- 1.0 / _jacobianQuad[iQuadPt*_spaceDim+iDim];
+ _jacobianInv[iQuadPt*_spaceDim+iDim] =
+ 1.0 / _jacobian[iQuadPt*_spaceDim+iDim];
} // for
-} // computeGeometryQuad
+} // computeGeometry
// End of file
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,25 +44,15 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -36,66 +36,13 @@
} // copy constructor
// ----------------------------------------------------------------------
-// Compute geometric quantities for a cell at vertices.
-void
-pylith::feassemble::Quadrature2D::computeGeometryVert(
- const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell)
-{ // computeGeometryVert
- assert(2 == _cellDim);
- assert(2 == _spaceDim);
-
- _resetGeometry();
-
- // Get coordinates of cell's vertices
- const real_section_type::value_type* vertCoords =
- mesh->restrict(coordinates, cell);
- assert(2 == coordinates->getFiberDimension(*mesh->depthStratum(0)->begin()));
-
- // Loop over vertices
- const int numVertices = _numBasis;
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
- // Compute Jacobian at vertex
- // J = [dx/dp dy/dp]
- // [dx/dq dy/dq]
- // dx/dp = sum[i=0,n-1] (dNi/dp * xi)
- // dy/dp = sum[i=0,n-1] (dNi/dp * yi)
- // dx/dq = sum[i=0,n-1] (dNi/dq * xi)
- // dy/dq = sum[i=0,n-1] (dNi/dq * yi)
- for (int iBasis=0; iBasis < _numBasis; ++iBasis)
- for (int iRow=0; iRow < _cellDim; ++iRow) {
- const double deriv =
- _basisDerivVert[iVertex*_numBasis*_spaceDim+iBasis*_cellDim+iRow];
- for (int iCol=0; iCol < _spaceDim; ++iCol)
- _jacobianVert[iVertex*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
- deriv * vertCoords[iBasis*_spaceDim+iCol];
- } // for
-
- // Compute determinant of Jacobian at quadrature point
- // |J| = j00*j11-j01*j10
- const int iJ = iVertex*_cellDim*_spaceDim;
- const int i00 = iJ + 0*_spaceDim + 0;
- const int i01 = iJ + 0*_spaceDim + 1;
- const int i10 = iJ + 1*_spaceDim + 0;
- const int i11 = iJ + 1*_spaceDim + 1;
- const double det =
- _jacobianVert[i00]*_jacobianVert[i11] -
- _jacobianVert[i01]*_jacobianVert[i10];
- _checkJacobianDet(det);
- _jacobianDetVert[iVertex] = det;
- } // for
-
-} // computeGeometryVert
-
-// ----------------------------------------------------------------------
// Compute geometric quantities for a cell at quadrature points.
void
-pylith::feassemble::Quadrature2D::computeGeometryQuad(
+pylith::feassemble::Quadrature2D::computeGeometry(
const ALE::Obj<Mesh>& mesh,
const ALE::Obj<real_section_type>& coordinates,
const Mesh::point_type& cell)
-{ // computeGeometryQuad
+{ // computeGeometry
assert(2 == _cellDim);
assert(2 == _spaceDim);
@@ -113,7 +60,7 @@
// x = sum[i=0,n-1] (Ni * xi)
// y = sum[i=0,n-1] (Ni * yi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double basis = _basisQuad[iQuadPt*_numBasis+iBasis];
+ const double basis = _basis[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
_quadPts[iQuadPt*_spaceDim+iDim] +=
basis * vertCoords[iBasis*_spaceDim+iDim];
@@ -129,9 +76,9 @@
for (int iBasis=0; iBasis < _numBasis; ++iBasis)
for (int iRow=0; iRow < _cellDim; ++iRow) {
const double deriv =
- _basisDerivQuad[iQuadPt*_numBasis*_spaceDim+iBasis*_cellDim+iRow];
+ _basisDeriv[iQuadPt*_numBasis*_spaceDim+iBasis*_cellDim+iRow];
for (int iCol=0; iCol < _spaceDim; ++iCol)
- _jacobianQuad[iQuadPt*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
+ _jacobian[iQuadPt*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
deriv * vertCoords[iBasis*_spaceDim+iCol];
} // for
@@ -143,20 +90,20 @@
const int i10 = iJ + 1*_spaceDim + 0;
const int i11 = iJ + 1*_spaceDim + 1;
const double det =
- _jacobianQuad[i00]*_jacobianQuad[i11] -
- _jacobianQuad[i01]*_jacobianQuad[i10];
+ _jacobian[i00]*_jacobian[i11] -
+ _jacobian[i01]*_jacobian[i10];
_checkJacobianDet(det);
- _jacobianDetQuad[iQuadPt] = det;
+ _jacobianDet[iQuadPt] = det;
// Compute inverse of Jacobian at quadrature point
// Jinv = 1/det*[ j11 -j01]
// [-j10 j00]
- _jacobianInvQuad[i00] = _jacobianQuad[i11] / det;
- _jacobianInvQuad[i01] = -_jacobianQuad[i01] / det;
- _jacobianInvQuad[i10] = -_jacobianQuad[i10] / det;
- _jacobianInvQuad[i11] = _jacobianQuad[i00] / det;
+ _jacobianInv[i00] = _jacobian[i11] / det;
+ _jacobianInv[i01] = -_jacobian[i01] / det;
+ _jacobianInv[i10] = -_jacobian[i10] / det;
+ _jacobianInv[i11] = _jacobian[i00] / det;
} // for
-} // computeGeometryQuad
+} // computeGeometry
// End of file
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,25 +44,15 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -39,82 +39,13 @@
} // copy constructor
// ----------------------------------------------------------------------
-// Compute geometric quantities for a cell at vertices.
-void
-pylith::feassemble::Quadrature2Din3D::computeGeometryVert(
- const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell)
-{ // computeGeometryVert
- assert(2 == _cellDim);
- assert(3 == _spaceDim);
-
- _resetGeometry();
-
- // Get coordinates of cell's vertices
- const real_section_type::value_type* vertCoords =
- mesh->restrict(coordinates, cell);
- assert(3 == coordinates->getFiberDimension(*mesh->depthStratum(0)->begin()));
-
- // Loop over vertices
- const int numVertices = _numBasis;
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
- // Compute Jacobian at vertex
- // J = [dx/dp dy/dp dz/dp]
- // [dx/dq dy/dq dz/dq]
- // dx/dp = sum[i=0,n-1] (dNi/dp * xi)
- // dy/dp = sum[i=0,n-1] (dNi/dp * yi)
- // dz/dp = sum[i=0,n-1] (dNi/dp * zi)
- // dx/dq = sum[i=0,n-1] (dNi/dq * xi)
- // dy/dq = sum[i=0,n-1] (dNi/dq * yi)
- // dz/dq = sum[i=0,n-1] (dNi/dq * zi)
- for (int iBasis=0; iBasis < _numBasis; ++iBasis)
- for (int iRow=0; iRow < _cellDim; ++iRow) {
- const double deriv =
- _basisDerivVert[iVertex*_numBasis*_cellDim+iBasis*_cellDim+iRow];
- for (int iCol=0; iCol < _spaceDim; ++iCol)
- _jacobianVert[iVertex*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
- deriv * vertCoords[iBasis*+_spaceDim+iCol];
- } // for
-
- // Compute determinant of Jacobian at quadrature point
- // |J| = sqrt(J transpose(J))
- const int iJ = iVertex*_cellDim*_spaceDim;
- const int i00 = iJ + 0*_spaceDim + 0;
- const int i01 = iJ + 0*_spaceDim + 1;
- const int i02 = iJ + 0*_spaceDim + 2;
- const int i10 = iJ + 1*_spaceDim + 0;
- const int i11 = iJ + 1*_spaceDim + 1;
- const int i12 = iJ + 1*_spaceDim + 2;
- // JJ = J transpose(J)
- const double jj00 =
- _jacobianVert[i00]*_jacobianVert[i00] +
- _jacobianVert[i01]*_jacobianVert[i01] +
- _jacobianVert[i02]*_jacobianVert[i02];
- const double jj01 =
- _jacobianVert[i00]*_jacobianVert[i10] +
- _jacobianVert[i01]*_jacobianVert[i11] +
- _jacobianVert[i02]*_jacobianVert[i12];
- const double jj10 = jj01;
- const double jj11 =
- _jacobianVert[i10]*_jacobianVert[i10] +
- _jacobianVert[i11]*_jacobianVert[i11] +
- _jacobianVert[i12]*_jacobianVert[i12];
- const double det = sqrt(jj00*jj11 - jj01*jj10);
- _checkJacobianDet(det);
- _jacobianDetVert[iVertex] = det;
- } // for
-
-} // computeGeometryVert
-
-// ----------------------------------------------------------------------
// Compute geometric quantities for a cell at quadrature points.
void
-pylith::feassemble::Quadrature2Din3D::computeGeometryQuad(
+pylith::feassemble::Quadrature2Din3D::computeGeometry(
const ALE::Obj<Mesh>& mesh,
const ALE::Obj<real_section_type>& coordinates,
const Mesh::point_type& cell)
-{ // computeGeometryQuad
+{ // computeGeometry
assert(2 == _cellDim);
assert(3 == _spaceDim);
@@ -133,7 +64,7 @@
// y = sum[i=0,n-1] (Ni * yi)
// z = sum[i=0,n-1] (Ni * zi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double basis = _basisQuad[iQuadPt*_numBasis+iBasis];
+ const double basis = _basis[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
_quadPts[iQuadPt*_spaceDim+iDim] +=
basis * vertCoords[iBasis*_spaceDim+iDim];
@@ -151,9 +82,9 @@
for (int iBasis=0; iBasis < _numBasis; ++iBasis)
for (int iRow=0; iRow < _cellDim; ++iRow) {
const double deriv =
- _basisDerivQuad[iQuadPt*_numBasis*_cellDim+iBasis*_cellDim+iRow];
+ _basisDeriv[iQuadPt*_numBasis*_cellDim+iBasis*_cellDim+iRow];
for (int iCol=0; iCol < _spaceDim; ++iCol)
- _jacobianQuad[iQuadPt*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
+ _jacobian[iQuadPt*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
deriv * vertCoords[iBasis*+_spaceDim+iCol];
} // for
@@ -168,89 +99,89 @@
const int i12 = iJ + 1*_spaceDim + 2;
// JJ = J transpose(J)
const double jj00 =
- _jacobianQuad[i00]*_jacobianQuad[i00] +
- _jacobianQuad[i01]*_jacobianQuad[i01] +
- _jacobianQuad[i02]*_jacobianQuad[i02];
+ _jacobian[i00]*_jacobian[i00] +
+ _jacobian[i01]*_jacobian[i01] +
+ _jacobian[i02]*_jacobian[i02];
const double jj01 =
- _jacobianQuad[i00]*_jacobianQuad[i10] +
- _jacobianQuad[i01]*_jacobianQuad[i11] +
- _jacobianQuad[i02]*_jacobianQuad[i12];
+ _jacobian[i00]*_jacobian[i10] +
+ _jacobian[i01]*_jacobian[i11] +
+ _jacobian[i02]*_jacobian[i12];
const double jj10 = jj01;
const double jj11 =
- _jacobianQuad[i10]*_jacobianQuad[i10] +
- _jacobianQuad[i11]*_jacobianQuad[i11] +
- _jacobianQuad[i12]*_jacobianQuad[i12];
+ _jacobian[i10]*_jacobian[i10] +
+ _jacobian[i11]*_jacobian[i11] +
+ _jacobian[i12]*_jacobian[i12];
const double det = sqrt(jj00*jj11 - jj01*jj10);
_checkJacobianDet(det);
- _jacobianDetQuad[iQuadPt] = det;
+ _jacobianDet[iQuadPt] = det;
// Compute inverse of Jacobian at quadrature point
const double d01 =
- _jacobianQuad[i00]*_jacobianQuad[i11] -
- _jacobianQuad[i10]*_jacobianQuad[i01];
+ _jacobian[i00]*_jacobian[i11] -
+ _jacobian[i10]*_jacobian[i01];
const double d12 =
- _jacobianQuad[i01]*_jacobianQuad[i12] -
- _jacobianQuad[i11]*_jacobianQuad[i02];
+ _jacobian[i01]*_jacobian[i12] -
+ _jacobian[i11]*_jacobian[i02];
const double d02 =
- _jacobianQuad[i00]*_jacobianQuad[i12] -
- _jacobianQuad[i10]*_jacobianQuad[i02];
+ _jacobian[i00]*_jacobian[i12] -
+ _jacobian[i10]*_jacobian[i02];
if (fabs(d01) > _minJacobian) {
// Jinv00 = 1/d01 * J11
// Jinv01 = 1/d01 * -J01
// Jinv10 = 1/d01 * -J10
// Jinv11 = 1/d01 * J00
- _jacobianInvQuad[iJ+0] = _jacobianQuad[i11] / d01; // Jinv00
- _jacobianInvQuad[iJ+1] = -_jacobianQuad[i01] / d01; // Jinv01
- _jacobianInvQuad[iJ+2] = -_jacobianQuad[i10] / d01; // Jinv10
- _jacobianInvQuad[iJ+3] = _jacobianQuad[i00] / d01; // Jinv11
+ _jacobianInv[iJ+0] = _jacobian[i11] / d01; // Jinv00
+ _jacobianInv[iJ+1] = -_jacobian[i01] / d01; // Jinv01
+ _jacobianInv[iJ+2] = -_jacobian[i10] / d01; // Jinv10
+ _jacobianInv[iJ+3] = _jacobian[i00] / d01; // Jinv11
if (fabs(d12) > _minJacobian) {
// Jinv20 = 1/d12 -J11
// Jinv21 = 1/d12 J01
- _jacobianInvQuad[iJ+4] = -_jacobianQuad[i11] / d12; // Jinv20
- _jacobianInvQuad[iJ+5] = _jacobianQuad[i01] / d12; // Jinv21
+ _jacobianInv[iJ+4] = -_jacobian[i11] / d12; // Jinv20
+ _jacobianInv[iJ+5] = _jacobian[i01] / d12; // Jinv21
} else if (fabs(d02) > _minJacobian) {
// Jinv20 = 1/d02 -J10
// Jinv21 = 1/d02 J00
- _jacobianInvQuad[iJ+4] = -_jacobianQuad[i10] / d02; // Jinv20
- _jacobianInvQuad[iJ+5] = _jacobianQuad[i00] / d02; // Jinv21
+ _jacobianInv[iJ+4] = -_jacobian[i10] / d02; // Jinv20
+ _jacobianInv[iJ+5] = _jacobian[i00] / d02; // Jinv21
} else {
- _jacobianInvQuad[iJ+4] = 0.0; // Jinv20
- _jacobianInvQuad[iJ+5] = 0.0; // Jinv21
+ _jacobianInv[iJ+4] = 0.0; // Jinv20
+ _jacobianInv[iJ+5] = 0.0; // Jinv21
} // if/else
} else if (fabs(d02) > _minJacobian) {
// Jinv00 = 1/d02 * J12
// Jinv01 = 1/d02 * -J02
// Jinv20 = 1/d02 * -J10
// Jinv21 = 1/d02 * J00
- _jacobianInvQuad[iJ+0] = _jacobianQuad[i12] / d02; // Jinv00
- _jacobianInvQuad[iJ+1] = -_jacobianQuad[i02] / d02; // Jinv01
- _jacobianInvQuad[iJ+4] = -_jacobianQuad[i10] / d02; // Jinv20
- _jacobianInvQuad[iJ+5] = _jacobianQuad[i00] / d02; // Jinv21
+ _jacobianInv[iJ+0] = _jacobian[i12] / d02; // Jinv00
+ _jacobianInv[iJ+1] = -_jacobian[i02] / d02; // Jinv01
+ _jacobianInv[iJ+4] = -_jacobian[i10] / d02; // Jinv20
+ _jacobianInv[iJ+5] = _jacobian[i00] / d02; // Jinv21
if (fabs(d12) > _minJacobian) {
// Jinv10 = 1/d12 J12
// Jinv11 = 1/d12 -J02
- _jacobianInvQuad[iJ+2] = -_jacobianQuad[i12] / d12; // Jinv10
- _jacobianInvQuad[iJ+3] = _jacobianQuad[i02] / d12; // Jinv11
+ _jacobianInv[iJ+2] = -_jacobian[i12] / d12; // Jinv10
+ _jacobianInv[iJ+3] = _jacobian[i02] / d12; // Jinv11
} else {
- _jacobianInvQuad[iJ+2] = 0.0; // Jinv10
- _jacobianInvQuad[iJ+3] = 0.0; // Jinv11
+ _jacobianInv[iJ+2] = 0.0; // Jinv10
+ _jacobianInv[iJ+3] = 0.0; // Jinv11
} // if/else
} else if (fabs(d12) > _minJacobian) {
- _jacobianInvQuad[iJ+0] = 0.0; // Jinv00
- _jacobianInvQuad[iJ+1] = 0.0; // Jinv01
+ _jacobianInv[iJ+0] = 0.0; // Jinv00
+ _jacobianInv[iJ+1] = 0.0; // Jinv01
// Jinv10 = 1/d12 J12
// Jinv11 = 1/d12 -J02
// Jinv20 = 1/d12 -J11
// Jinv21 = 1/d12 J01
- _jacobianInvQuad[iJ+2] = _jacobianQuad[i12] / d12; // Jinv10
- _jacobianInvQuad[iJ+3] = -_jacobianQuad[i02] / d12; // Jin11
- _jacobianInvQuad[iJ+4] = -_jacobianQuad[i11] / d12; // Jinv20
- _jacobianInvQuad[iJ+5] = _jacobianQuad[i01] / d12; // Jinv21
+ _jacobianInv[iJ+2] = _jacobian[i12] / d12; // Jinv10
+ _jacobianInv[iJ+3] = -_jacobian[i02] / d12; // Jin11
+ _jacobianInv[iJ+4] = -_jacobian[i11] / d12; // Jinv20
+ _jacobianInv[iJ+5] = _jacobian[i01] / d12; // Jinv21
} else
throw std::runtime_error("Could not invert Jacobian.");
} // for
-} // computeGeometryQuad
+} // computeGeometry
// End of file
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,25 +44,15 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -36,83 +36,13 @@
} // copy constructor
// ----------------------------------------------------------------------
-// Compute geometric quantities for a cell at vertices.
-void
-pylith::feassemble::Quadrature3D::computeGeometryVert(
- const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell)
-{ // computeGeometryVert
- assert(3 == _cellDim);
- assert(3 == _spaceDim);
-
- _resetGeometry();
-
- // Get coordinates of cell's vertices
- const real_section_type::value_type* vertCoords =
- mesh->restrict(coordinates, cell);
- assert(3 == coordinates->getFiberDimension(*mesh->depthStratum(0)->begin()));
-
- // Loop over vertices
- const int numVertices = _numBasis;
- for (int iVertex=0; iVertex < numVertices; ++iVertex) {
- // Compute Jacobian at vertex
- // J = [dx/dp dy/dp dz/dp]
- // [dx/dq dy/dq dz/dq]
- // [dx/dr dy/dr dz/dr]
- // dx/dp = sum[i=0,n-1] (dNi/dp * xi)
- // dy/dp = sum[i=0,n-1] (dNi/dp * yi)
- // dz/dp = sum[i=0,n-1] (dNi/dp * zi)
- // dx/dq = sum[i=0,n-1] (dNi/dq * xi)
- // dy/dq = sum[i=0,n-1] (dNi/dq * yi)
- // dz/dq = sum[i=0,n-1] (dNi/dq * zi)
- // dx/dr = sum[i=0,n-1] (dNi/dr * xi)
- // dy/dr = sum[i=0,n-1] (dNi/dr * yi)
- // dz/dr = sum[i=0,n-1] (dNi/dr * zi)
- for (int iBasis=0; iBasis < _numBasis; ++iBasis)
- for (int iRow=0; iRow < _cellDim; ++iRow) {
- const double deriv =
- _basisDerivVert[iVertex*_numBasis*_spaceDim+iBasis*_cellDim+iRow];
- for (int iCol=0; iCol < _spaceDim; ++iCol)
- _jacobianVert[iVertex*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
- deriv * vertCoords[iBasis*_spaceDim+iCol];
- } // for
-
- // Compute determinant of Jacobian at vertex
- // |J| = j00*(j11*j22-j12*j21) +
- // -j01*(j10*j22-j12*j20) +
- // j02*(j10*j21-j11*j20)
- const int iJ = iVertex*_cellDim*_spaceDim;
- const int i00 = iJ + 0*_spaceDim + 0;
- const int i01 = iJ + 0*_spaceDim + 1;
- const int i02 = iJ + 0*_spaceDim + 2;
- const int i10 = iJ + 1*_spaceDim + 0;
- const int i11 = iJ + 1*_spaceDim + 1;
- const int i12 = iJ + 1*_spaceDim + 2;
- const int i20 = iJ + 2*_spaceDim + 0;
- const int i21 = iJ + 2*_spaceDim + 1;
- const int i22 = iJ + 2*_spaceDim + 2;
- const double det =
- _jacobianVert[i00]*(_jacobianVert[i11]*_jacobianVert[i22] -
- _jacobianVert[i12]*_jacobianVert[i21]) -
- _jacobianVert[i01]*(_jacobianVert[i10]*_jacobianVert[i22] -
- _jacobianVert[i12]*_jacobianVert[i20]) +
- _jacobianVert[i02]*(_jacobianVert[i10]*_jacobianVert[i21] -
- _jacobianVert[i11]*_jacobianVert[i20]);
- _checkJacobianDet(det);
- _jacobianDetVert[iVertex] = det;
- } // for
-
-} // computeGeometryVert
-
-// ----------------------------------------------------------------------
// Compute geometric quantities for a cell at quadrature points.
void
-pylith::feassemble::Quadrature3D::computeGeometryQuad(
+pylith::feassemble::Quadrature3D::computeGeometry(
const ALE::Obj<Mesh>& mesh,
const ALE::Obj<real_section_type>& coordinates,
const Mesh::point_type& cell)
-{ // computeGeometryQuad
+{ // computeGeometry
assert(3 == _cellDim);
assert(3 == _spaceDim);
@@ -131,7 +61,7 @@
// y = sum[i=0,n-1] (Ni * yi)
// z = sum[i=0,n-1] (Ni * zi)
for (int iBasis=0; iBasis < _numBasis; ++iBasis) {
- const double basis = _basisQuad[iQuadPt*_numBasis+iBasis];
+ const double basis = _basis[iQuadPt*_numBasis+iBasis];
for (int iDim=0; iDim < _spaceDim; ++iDim)
_quadPts[iQuadPt*_spaceDim+iDim] +=
basis * vertCoords[iBasis*_spaceDim+iDim];
@@ -153,9 +83,9 @@
for (int iBasis=0; iBasis < _numBasis; ++iBasis)
for (int iRow=0; iRow < _cellDim; ++iRow) {
const double deriv =
- _basisDerivQuad[iQuadPt*_numBasis*_spaceDim+iBasis*_cellDim+iRow];
+ _basisDeriv[iQuadPt*_numBasis*_spaceDim+iBasis*_cellDim+iRow];
for (int iCol=0; iCol < _spaceDim; ++iCol)
- _jacobianQuad[iQuadPt*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
+ _jacobian[iQuadPt*_cellDim*_spaceDim+iRow*_spaceDim+iCol] +=
deriv * vertCoords[iBasis*_spaceDim+iCol];
} // for
@@ -174,36 +104,36 @@
const int i21 = iJ + 2*_spaceDim + 1;
const int i22 = iJ + 2*_spaceDim + 2;
const double det =
- _jacobianQuad[i00]*(_jacobianQuad[i11]*_jacobianQuad[i22] -
- _jacobianQuad[i12]*_jacobianQuad[i21]) -
- _jacobianQuad[i01]*(_jacobianQuad[i10]*_jacobianQuad[i22] -
- _jacobianQuad[i12]*_jacobianQuad[i20]) +
- _jacobianQuad[i02]*(_jacobianQuad[i10]*_jacobianQuad[i21] -
- _jacobianQuad[i11]*_jacobianQuad[i20]);
+ _jacobian[i00]*(_jacobian[i11]*_jacobian[i22] -
+ _jacobian[i12]*_jacobian[i21]) -
+ _jacobian[i01]*(_jacobian[i10]*_jacobian[i22] -
+ _jacobian[i12]*_jacobian[i20]) +
+ _jacobian[i02]*(_jacobian[i10]*_jacobian[i21] -
+ _jacobian[i11]*_jacobian[i20]);
_checkJacobianDet(det);
- _jacobianDetQuad[iQuadPt] = det;
+ _jacobianDet[iQuadPt] = det;
// Compute inverse of Jacobian at quadrature point
- _jacobianInvQuad[i00] = (_jacobianQuad[i11]*_jacobianQuad[i22] -
- _jacobianQuad[i12]*_jacobianQuad[i21]) / det;
- _jacobianInvQuad[i01] = (_jacobianQuad[i02]*_jacobianQuad[i21] -
- _jacobianQuad[i01]*_jacobianQuad[i22]) / det;
- _jacobianInvQuad[i02] = (_jacobianQuad[i01]*_jacobianQuad[i12] -
- _jacobianQuad[i02]*_jacobianQuad[i11]) / det;
- _jacobianInvQuad[i10] = (_jacobianQuad[i12]*_jacobianQuad[i20] -
- _jacobianQuad[i10]*_jacobianQuad[i22]) / det;
- _jacobianInvQuad[i11] = (_jacobianQuad[i00]*_jacobianQuad[i22] -
- _jacobianQuad[i02]*_jacobianQuad[i20]) / det;
- _jacobianInvQuad[i12] = (_jacobianQuad[i02]*_jacobianQuad[i10] -
- _jacobianQuad[i00]*_jacobianQuad[i12]) / det;
- _jacobianInvQuad[i20] = (_jacobianQuad[i10]*_jacobianQuad[i21] -
- _jacobianQuad[i11]*_jacobianQuad[i20]) / det;
- _jacobianInvQuad[i21] = (_jacobianQuad[i01]*_jacobianQuad[i20] -
- _jacobianQuad[i00]*_jacobianQuad[i21]) / det;
- _jacobianInvQuad[i22] = (_jacobianQuad[i00]*_jacobianQuad[i11] -
- _jacobianQuad[i01]*_jacobianQuad[i10]) / det;
+ _jacobianInv[i00] = (_jacobian[i11]*_jacobian[i22] -
+ _jacobian[i12]*_jacobian[i21]) / det;
+ _jacobianInv[i01] = (_jacobian[i02]*_jacobian[i21] -
+ _jacobian[i01]*_jacobian[i22]) / det;
+ _jacobianInv[i02] = (_jacobian[i01]*_jacobian[i12] -
+ _jacobian[i02]*_jacobian[i11]) / det;
+ _jacobianInv[i10] = (_jacobian[i12]*_jacobian[i20] -
+ _jacobian[i10]*_jacobian[i22]) / det;
+ _jacobianInv[i11] = (_jacobian[i00]*_jacobian[i22] -
+ _jacobian[i02]*_jacobian[i20]) / det;
+ _jacobianInv[i12] = (_jacobian[i02]*_jacobian[i10] -
+ _jacobian[i00]*_jacobian[i12]) / det;
+ _jacobianInv[i20] = (_jacobian[i10]*_jacobian[i21] -
+ _jacobian[i11]*_jacobian[i20]) / det;
+ _jacobianInv[i21] = (_jacobian[i01]*_jacobian[i20] -
+ _jacobian[i00]*_jacobian[i21]) / det;
+ _jacobianInv[i22] = (_jacobian[i00]*_jacobian[i11] -
+ _jacobian[i01]*_jacobian[i10]) / det;
} // for
-} // computeGeometryQuad
+} // computeGeometry
// End of file
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,25 +44,15 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- /** Compute geometric quantities for a cell at vertices.
- *
- * @param mesh Finite-element mesh
- * @param coordinates Section containing vertex coordinates
- * @param cell Finite-element cell
- */
- void computeGeometryVert(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
-
/** Compute geometric quantities for a cell at quadrature points.
*
* @param mesh Finite-element mesh
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometryQuad(const ALE::Obj<Mesh>& mesh,
- const ALE::Obj<real_section_type>& coordinates,
- const Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<Mesh>& mesh,
+ const ALE::Obj<real_section_type>& coordinates,
+ const Mesh::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/materials/Material.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/materials/Material.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/libsrc/materials/Material.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -119,7 +119,7 @@
cellIter != cellsEnd;
++cellIter) {
// Compute geometry information for current cell
- quadrature->computeGeometryQuad(mesh, coordinates, *cellIter);
+ quadrature->computeGeometry(mesh, coordinates, *cellIter);
const double_array& quadPts = quadrature->quadPts();
const int spaceDim = quadrature->spaceDim();
Modified: short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/modulesrc/feassemble/feassemble.pyxe.src 2007-05-11 23:07:43 UTC (rev 6857)
@@ -89,18 +89,15 @@
def initialize(self,
- basisVert, basisDerivVert,
- basisQuad, basisDerivQuad,
+ basis, basisDeriv,
quadPts, quadWts,
cellDim, numBasis, numQuadPts, spaceDim):
"""
Set basis functions and their derivatives, and coordinates and
weights of quadrature points.
- @param basisVert Basis functions evaluated at the vertices
- @param basisDerivVert Basis function derivatives evaluated at vertices
- @param basisQuad Basis functions evaluated at the quadrature points
- @param basisDerivQuad Basis function derivatives evaluated at quad pts
+ @param basis Basis functions evaluated at the quadrature points
+ @param basisDeriv Basis function derivatives evaluated at quad pts
@param quadPts Coordinates of quadrature points in reference cell
@param quadWts Weights of quadrature points
@param cellDim Dimension of reference cell
@@ -109,11 +106,10 @@
@param spaceDim Number of dimensions associated with cell vertices
"""
# create shim for method 'initialize'
- #embed{ void Quadrature_initialize(void* objVptr, double* basisVert, double* basisDerivVert, double* basisQuad, double* basisDerivQuad, double* quadPts, double* quadWts, int cellDim, int numBasis, int numQuadPts, int spaceDim)
+ #embed{ void Quadrature_initialize(void* objVptr, double* basis, double* basisDeriv, double* quadPts, double* quadWts, int cellDim, int numBasis, int numQuadPts, int spaceDim)
try {
((pylith::feassemble::Quadrature*) objVptr)->initialize(
- basisVert, basisDerivVert,
- basisQuad, basisDerivQuad,
+ basis, basisDeriv,
quadPts, quadWts,
cellDim, numBasis,
numQuadPts, spaceDim);
@@ -130,56 +126,31 @@
numVertices = numBasis
- # basisVert
- basisVert = spatialdata.utils.simplearray.objAsSimpleArray(basisVert)
- if not basisVert.isCompatible(nd=2, simpletype="double",
- contiguous=True, notswapped=True):
+ # basis
+ basis = spatialdata.utils.simplearray.objAsSimpleArray(basis)
+ if not basis.isCompatible(nd=2, simpletype="double",
+ contiguous=True, notswapped=True):
raise TypeError, \
- "Argument 'basisVert' must be a contiguous, 2-D array " \
+ "Argument 'basis' must be a contiguous, 2-D array " \
"of type double."
- if numVertices != basisVert.shape[0] or numBasis != basisVert.shape[1]:
+ if numQuadPts != basis.shape[0] or numBasis != basis.shape[1]:
raise TypeError, \
- "Shape of argument 'basisVert' must be (numVertices, numBasis)."
+ "Shape of argument 'basis' must be (numQuadPts, numBasis)."
- # basisDerivVert
- basisDerivVert = spatialdata.utils.simplearray.objAsSimpleArray(basisDerivVert)
- if not basisDerivVert.isCompatible(nd=3, simpletype="double",
- contiguous=True, notswapped=True):
+ # basisDeriv
+ basisDeriv = spatialdata.utils.simplearray.objAsSimpleArray(basisDeriv)
+ if not basisDeriv.isCompatible(nd=3, simpletype="double",
+ contiguous=True, notswapped=True):
raise TypeError, \
- "Argument 'basisDerivVert' must be a contiguous, 3-D array " \
+ "Argument 'basisDeriv' must be a contiguous, 3-D array " \
"of type double."
- if numVertices != basisDerivVert.shape[0] or \
- numBasis != basisDerivVert.shape[1] or \
- cellDim != basisDerivVert.shape[2]:
+ if numQuadPts != basisDeriv.shape[0] or \
+ numBasis != basisDeriv.shape[1] or \
+ cellDim != basisDeriv.shape[2]:
raise TypeError, \
- "Shape of argument 'basisDerivVert' must be (numVertices, " \
+ "Shape of argument 'basisDeriv' must be (numQuadPts, " \
"numBasis, cellDim)."
- # basisQuad
- basisQuad = spatialdata.utils.simplearray.objAsSimpleArray(basisQuad)
- if not basisQuad.isCompatible(nd=2, simpletype="double",
- contiguous=True, notswapped=True):
- raise TypeError, \
- "Argument 'basisQuad' must be a contiguous, 2-D array " \
- "of type double."
- if numQuadPts != basisQuad.shape[0] or numBasis != basisQuad.shape[1]:
- raise TypeError, \
- "Shape of argument 'basisQuad' must be (numQuadPts, numBasis)."
-
- # basisDerivQuad
- basisDerivQuad = spatialdata.utils.simplearray.objAsSimpleArray(basisDerivQuad)
- if not basisDerivQuad.isCompatible(nd=3, simpletype="double",
- contiguous=True, notswapped=True):
- raise TypeError, \
- "Argument 'basisDerivQuad' must be a contiguous, 3-D array " \
- "of type double."
- if numQuadPts != basisDerivQuad.shape[0] or \
- numBasis != basisDerivQuad.shape[1] or \
- cellDim != basisDerivQuad.shape[2]:
- raise TypeError, \
- "Shape of argument 'basisDerivQuad' must be (numQuadPts, " \
- "numBasis, cellDim)."
-
# quadPts
quadPts = spatialdata.utils.simplearray.objAsSimpleArray(quadPts)
if not quadPts.isCompatible(nd=2, simpletype="double",
@@ -202,22 +173,17 @@
raise TypeError, \
"Shape of argument 'quadWts' must be (numQuadPts)."
- cdef double* basisCppVert
- cdef double* basisDerivCppVert
- cdef double* basisCppQuad
- cdef double* basisDerivCppQuad
+ cdef double* basisCpp
+ cdef double* basisDerivCpp
cdef double* quadPtsCpp
cdef double* quadWtsCpp
- basisCppVert = <double*> PyCObject_AsVoidPtr(basisVert.data)
- basisDerivCppVert = <double*> PyCObject_AsVoidPtr(basisDerivVert.data)
- basisCppQuad = <double*> PyCObject_AsVoidPtr(basisQuad.data)
- basisDerivCppQuad = <double*> PyCObject_AsVoidPtr(basisDerivQuad.data)
+ basisCpp = <double*> PyCObject_AsVoidPtr(basis.data)
+ basisDerivCpp = <double*> PyCObject_AsVoidPtr(basisDeriv.data)
quadPtsCpp = <double*> PyCObject_AsVoidPtr(quadPts.data)
quadWtsCpp = <double*> PyCObject_AsVoidPtr(quadWts.data)
Quadrature_initialize(self.thisptr,
- basisCppVert, basisDerivCppVert,
- basisCppQuad, basisDerivCppQuad,
+ basisCpp, basisDerivCpp,
quadPtsCpp, quadWtsCpp,
cellDim, numBasis,
numQuadPts, spaceDim)
Modified: short/3D/PyLith/trunk/pylith/feassemble/FIATCell.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/FIATCell.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/pylith/feassemble/FIATCell.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -46,46 +46,30 @@
"""
quadrature = self._setupQuadrature()
basisFns = self._setupBasisFns()
- vertices = self._setupVertices()
- # Evaluate basis functions at vertices
- basis = numpy.array(basisFns.tabulate(vertices)).transpose()
- self.basisVert = numpy.reshape(basis.flatten(), basis.shape)
-
- # Evaluate derivatives of basis functions at vertices
- import FIAT.shapes
- dim = FIAT.shapes.dimension(basisFns.base.shape)
- basisDeriv = numpy.array([basisFns.deriv_all(d).tabulate(vertices) \
- for d in range(dim)]).transpose()
- self.basisDerivVert = numpy.reshape(basisDeriv.flatten(), basisDeriv.shape)
-
# Evaluate basis functions at quadrature points
quadpts = quadrature.get_points()
basis = numpy.array(basisFns.tabulate(quadpts)).transpose()
- self.basisQuad = numpy.reshape(basis.flatten(), basis.shape)
+ self.basis = numpy.reshape(basis.flatten(), basis.shape)
# Evaluate derivatives of basis functions at quadrature points
import FIAT.shapes
dim = FIAT.shapes.dimension(basisFns.base.shape)
basisDeriv = numpy.array([basisFns.deriv_all(d).tabulate(quadpts) \
for d in range(dim)]).transpose()
- self.basisDerivQuad = numpy.reshape(basisDeriv.flatten(), basisDeriv.shape)
+ self.basisDeriv = numpy.reshape(basisDeriv.flatten(), basisDeriv.shape)
self.quadPts = numpy.array(quadrature.get_points())
self.quadWts = numpy.array(quadrature.get_weights())
self.cellDim = dim
- self.numCorners = self.basisVert.shape[1]
+ self.numCorners = len(basisFns)
self.numQuadPts = len(quadrature.get_weights())
- self._info.line("Basis (vertices):")
- self._info.line(self.basisVert)
- self._info.line("Basis derivatives (vertices):")
- self._info.line(self.basisDerivVert)
self._info.line("Basis (quad pts):")
- self._info.line(self.basisQuad)
+ self._info.line(self.basis)
self._info.line("Basis derivatives (quad pts):")
- self._info.line(self.basisDerivQuad)
+ self._info.line(self.basisDeriv)
self._info.line("Quad pts:")
self._info.line(quadrature.get_points())
self._info.line("Quad wts:")
@@ -114,12 +98,4 @@
return
- def _setupVertices(self):
- """
- Setup vertices for reference cell.
- """
- raise NotImplementedError()
- return
-
-
# End of file
Modified: short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/pylith/feassemble/FIATLagrange.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -15,6 +15,9 @@
## @brief Python object for managing basis functions and quadrature
## rules of a Lagrange reference finite-element cell using FIAT.
##
+## The basis functions are constructed from the tensor product of 1-D
+## Lagrance reference cells.
+##
## Factory: reference_cell.
from FIATCell import FIATCell
@@ -60,8 +63,8 @@
degree = pyre.inventory.int("degree", default=1)
degree.meta['tip'] = "Degree of finite-element cell."
- quadOrder = pyre.inventory.int("quad_order", default=-1)
- quadOrder.meta['tip'] = "Order of quadrature rule."
+ order = pyre.inventory.int("quad_order", default=-1)
+ order.meta['tip'] = "Order of quadrature rule."
# PUBLIC METHODS /////////////////////////////////////////////////////
@@ -85,16 +88,19 @@
FIATCell._configure(self)
self.cellDim = self.inventory.dimension
self.degree = self.inventory.degree
- self.quadOrder = self.inventory.quadOrder
+ self.order = self.inventory.order
+
+ # CHANGE TO BE LINE/QUADRILATERAL/HEXEHEDRAL
if self.cellDim == 1:
self.shape = FIAT.shapes.LINE
elif self.cellDim == 2:
self.shape = FIAT.shapes.TRIANGLE
elif self.cellDim == 3:
self.shape = FIAT.shapes.TETRAHEDRON
- if self.quadOrder == -1:
- self.quadOrder = 2*self.degree+1
- self.numCorners = self.cellDim+1
+ # END CHANGE
+
+ if self.order == -1:
+ self.order = 2*self.degree+1
return
@@ -102,11 +108,7 @@
"""
Setup quadrature rule for reference cell.
"""
- import FIAT.quadrature
- self.quadrature = FIAT.quadrature.make_quadrature_by_degree(shape, self.quadOrder)
- self.numQuadPts = len(quadrature.get_points())
- self.quadPts = quadrature.get_points()
- self.quadWts = quadrature.get_weights()
+ # :TODO: ADD STUFF HERE
return
@@ -116,14 +118,10 @@
"""
from FIAT.Lagrange import Lagrange
- self.element = Lagrange(self.shape, self.degree)
- points = self.quadrature.get_points()
- basis = self.element.function_space()
- self.numBasisFuncs = len(basis)
- self.basis = numpy.transpose(basis.tabulate(points))
- self.basisDeriv = numpy.transpose([basis.deriv_all(d).tabulate(points) for d in range(self.cellDim)])
+ # :TODO: ADD STUFF HERE
return
+
# FACTORIES ////////////////////////////////////////////////////////////
def reference_cell():
Modified: short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/pylith/feassemble/FIATSimplex.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -66,7 +66,7 @@
degree = pyre.inventory.int("degree", default=1)
degree.meta['tip'] = "Degree of finite-element cell."
- order = pyre.inventory.int("quad_order", default=3)
+ order = pyre.inventory.int("quad_order", default=-1)
order.meta['tip'] = "Order of quadrature rule."
@@ -89,6 +89,8 @@
self.shape = self.inventory.shape
self.degree = self.inventory.degree
self.order = self.inventory.order
+ if self.order == -1:
+ self.order = 2*self.degree+1
return
@@ -97,7 +99,8 @@
Setup quadrature rule for reference cell.
"""
import FIAT.quadrature
- return FIAT.quadrature.make_quadrature(self._getShape(), self.order)
+ return FIAT.quadrature.make_quadrature_by_degree(self._getShape(),
+ self.order)
def _setupBasisFns(self):
@@ -108,14 +111,6 @@
return Lagrange(self._getShape(), self.degree).function_space()
- def _setupVertices(self):
- """
- Setup vertices for reference cell.
- """
- import FIAT.shapes
- return FIAT.shapes.vertices[self._getShape()].values()
-
-
def _getShape(self):
"""
Parse string into FIAT shape.
Modified: short/3D/PyLith/trunk/pylith/feassemble/quadrature/Quadrature.py
===================================================================
--- short/3D/PyLith/trunk/pylith/feassemble/quadrature/Quadrature.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/pylith/feassemble/quadrature/Quadrature.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -87,8 +87,7 @@
self._info.log("Initializing C++ quadrature.")
- self.cppHandle.initialize(c.basisVert, c.basisDerivVert,
- c.basisQuad, c.basisDerivQuad,
+ self.cppHandle.initialize(c.basis, c.basisDeriv,
c.quadPts, c.quadWts,
c.cellDim, c.numCorners, c.numQuadPts,
self.spaceDim)
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -153,17 +153,14 @@
const int spaceDim = 3;
const int numBasis = 1;
const int numQuadPts = 1;
- const double basisVert[] = { 0.5, 0.3, 0.7 };
- const double basisDerivVert[] = { -0.5, 0.5, -0.4 };
- const double basisQuad[] = { 0.5, 0.5, 0.4 };
- const double basisDerivQuad[] = { 0.5, 0.3, -0.4 };
+ const double basis[] = { 0.5, 0.5, 0.4 };
+ const double basisDeriv[] = { 0.5, 0.3, -0.4 };
const double quadPtsRef[] = { 0.0, 3.0 };
const double quadWts[] = { 2.0 };
const double minJacobian = 1.0;
feassemble::Quadrature2Din3D q;
- q.initialize(basisVert, basisDerivVert,
- basisQuad, basisDerivQuad, quadPtsRef, quadWts,
+ q.initialize(basis, basisDeriv, quadPtsRef, quadWts,
cellDim, numBasis, numQuadPts, spaceDim);
FaultCohesiveKin fault;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -31,14 +31,14 @@
const int numBasisE = 2;
const int numQuadPtsE = 1;
const int spaceDimE = 1;
- const double basisQuadE[] = { 0.2, 0.4 };
- const double basisDerivQuadE[] = { 0.8, 1.6 };
+ const double basisE[] = { 0.2, 0.4 };
+ const double basisDerivE[] = { 0.8, 1.6 };
const double quadPtsRefE[] = { 3.2 };
const double quadWtsE[] = { 6.4 };
const double quadPtsE[] = { 12.8 };
- const double jacobianQuadE[] = { 2.56 };
- const double jacobianInvQuadE[] = { 5.12 };
- const double jacobianDetQuadE[] = { 10.24 };
+ const double jacobianE[] = { 2.56 };
+ const double jacobianInvE[] = { 5.12 };
+ const double jacobianDetE[] = { 10.24 };
// Set values
Quadrature1D qOrig;
@@ -49,12 +49,12 @@
qOrig._spaceDim = spaceDimE;
size_t size = 2;
- qOrig._basisQuad.resize(size);
- memcpy(&qOrig._basisQuad[0], basisQuadE, size*sizeof(double));
+ qOrig._basis.resize(size);
+ memcpy(&qOrig._basis[0], basisE, size*sizeof(double));
size = 2;
- qOrig._basisDerivQuad.resize(size);
- memcpy(&qOrig._basisDerivQuad[0], basisDerivQuadE, size*sizeof(double));
+ qOrig._basisDeriv.resize(size);
+ memcpy(&qOrig._basisDeriv[0], basisDerivE, size*sizeof(double));
size = 1;
qOrig._quadPtsRef.resize(size);
@@ -69,16 +69,16 @@
memcpy(&qOrig._quadPts[0], quadPtsE, size*sizeof(double));
size = 1;
- qOrig._jacobianQuad.resize(size);
- memcpy(&qOrig._jacobianQuad[0], jacobianQuadE, size*sizeof(double));
+ qOrig._jacobian.resize(size);
+ memcpy(&qOrig._jacobian[0], jacobianE, size*sizeof(double));
size = 1;
- qOrig._jacobianInvQuad.resize(size);
- memcpy(&qOrig._jacobianInvQuad[0], jacobianInvQuadE, size*sizeof(double));
+ qOrig._jacobianInv.resize(size);
+ memcpy(&qOrig._jacobianInv[0], jacobianInvE, size*sizeof(double));
size = 1;
- qOrig._jacobianDetQuad.resize(size);
- memcpy(&qOrig._jacobianDetQuad[0], jacobianDetQuadE, size*sizeof(double));
+ qOrig._jacobianDet.resize(size);
+ memcpy(&qOrig._jacobianDet[0], jacobianDetE, size*sizeof(double));
// Clone
const Quadrature* qCopy = qOrig.clone();
@@ -92,17 +92,17 @@
CPPUNIT_ASSERT_EQUAL(numQuadPtsE, qCopy->numQuadPts());
CPPUNIT_ASSERT_EQUAL(spaceDimE, qCopy->spaceDim());
- const double_array& basisQuad = qCopy->basisQuad();
+ const double_array& basis = qCopy->basis();
size = numBasisE * numQuadPtsE;
- CPPUNIT_ASSERT_EQUAL(size, basisQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, basis.size());
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(basisQuadE[i], basisQuad[i]);
+ CPPUNIT_ASSERT_EQUAL(basisE[i], basis[i]);
- const double_array& basisDerivQuad = qCopy->basisDerivQuad();
+ const double_array& basisDeriv = qCopy->basisDeriv();
size = numBasisE * numQuadPtsE * spaceDimE;
- CPPUNIT_ASSERT_EQUAL(size, basisDerivQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, basisDeriv.size());
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(basisDerivQuadE[i], basisDerivQuad[i]);
+ CPPUNIT_ASSERT_EQUAL(basisDerivE[i], basisDeriv[i]);
const double_array& quadPtsRef = qCopy->_quadPtsRef;
size = numQuadPtsE * cellDimE;
@@ -122,23 +122,23 @@
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(quadPtsE[i], quadPts[i]);
- const double_array& jacobianQuad = qCopy->_jacobianQuad;
+ const double_array& jacobian = qCopy->_jacobian;
size = 1;
- CPPUNIT_ASSERT_EQUAL(size, jacobianQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, jacobian.size());
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(jacobianQuadE[i], jacobianQuad[i]);
+ CPPUNIT_ASSERT_EQUAL(jacobianE[i], jacobian[i]);
- const double_array& jacobianInvQuad = qCopy->jacobianInvQuad();
+ const double_array& jacobianInv = qCopy->jacobianInv();
size = 1;
- CPPUNIT_ASSERT_EQUAL(size, jacobianInvQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, jacobianInv.size());
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(jacobianInvQuadE[i], jacobianInvQuad[i]);
+ CPPUNIT_ASSERT_EQUAL(jacobianInvE[i], jacobianInv[i]);
- const double_array& jacobianDetQuad = qCopy->jacobianDetQuad();
+ const double_array& jacobianDet = qCopy->jacobianDet();
size = 1;
- CPPUNIT_ASSERT_EQUAL(size, jacobianDetQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, jacobianDet.size());
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(jacobianDetQuadE[i], jacobianDetQuad[i]);
+ CPPUNIT_ASSERT_EQUAL(jacobianDetE[i], jacobianDet[i]);
delete qCopy; qCopy = 0;
} // testCopy
@@ -164,17 +164,14 @@
const int numBasis = 2;
const int numQuadPts = 1;
const int spaceDim = 1;
- const double basisVert[] = { 0.5, 0.5, 0.3, 0.7 };
- const double basisDerivVert[] = { -0.5, 0.5, -0.4, 0.7 };
- const double basisQuad[] = { 0.5, 0.5 };
- const double basisDerivQuad[] = { -0.5, 0.5 };
+ const double basis[] = { 0.5, 0.5 };
+ const double basisDeriv[] = { -0.5, 0.5 };
const double quadPtsRef[] = { 0.0 };
const double quadWts[] = { 2.0 };
const double minJacobian = 1.0;
Quadrature1D q;
- q.initialize(basisVert, basisDerivVert,
- basisQuad, basisDerivQuad, quadPtsRef, quadWts,
+ q.initialize(basis, basisDeriv, quadPtsRef, quadWts,
cellDim, numBasis, numQuadPts, spaceDim);
CPPUNIT_ASSERT_EQUAL(cellDim, q._cellDim);
@@ -182,23 +179,13 @@
CPPUNIT_ASSERT_EQUAL(numQuadPts, q._numQuadPts);
CPPUNIT_ASSERT_EQUAL(spaceDim, q._spaceDim);
- const int numVertices = numBasis;
-
- size_t size = numBasis * numVertices;
+ size_t size = numBasis * numQuadPts;
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(basisVert[i], q._basisVert[i]);
+ CPPUNIT_ASSERT_EQUAL(basis[i], q._basis[i]);
- size = numBasis * numVertices * spaceDim;
- for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(basisDerivVert[i], q._basisDerivVert[i]);
-
- size = numBasis * numQuadPts;
- for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(basisQuad[i], q._basisQuad[i]);
-
size = numBasis * numQuadPts * spaceDim;
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_EQUAL(basisDerivQuad[i], q._basisDerivQuad[i]);
+ CPPUNIT_ASSERT_EQUAL(basisDeriv[i], q._basisDeriv[i]);
size = numQuadPts * cellDim;
for (int i=0; i < size; ++i)
@@ -209,109 +196,31 @@
CPPUNIT_ASSERT_EQUAL(quadWts[i], q._quadWts[i]);
// Make sure Jacobian stuff has been allocated
- size = numVertices*cellDim*spaceDim;
- CPPUNIT_ASSERT_EQUAL(size, q._jacobianVert.size());
-
- size = numVertices;
- CPPUNIT_ASSERT_EQUAL(size, q._jacobianDetVert.size());
-
- // Make sure Jacobian stuff has been allocated
size = numQuadPts*cellDim*spaceDim;
- CPPUNIT_ASSERT_EQUAL(size, q._jacobianQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, q._jacobian.size());
size = numQuadPts*spaceDim*cellDim;
- CPPUNIT_ASSERT_EQUAL(size, q._jacobianInvQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, q._jacobianInv.size());
size = numQuadPts;
- CPPUNIT_ASSERT_EQUAL(size, q._jacobianDetQuad.size());
+ CPPUNIT_ASSERT_EQUAL(size, q._jacobianDet.size());
size = numQuadPts*spaceDim;
CPPUNIT_ASSERT_EQUAL(size, q._quadPts.size());
} // initialize
// ----------------------------------------------------------------------
-// Test initialize() & computeGeometryVert()
-void
-pylith::feassemble::TestQuadrature::_testComputeGeometryVert(
- Quadrature* pQuad,
- const QuadratureData& data) const
-{ // testComputeGeometry
- const int cellDim = data.cellDim;
- const int numBasis = data.numBasis;
- const int numQuadPts = data.numQuadPts;
- const int spaceDim = data.spaceDim;
- const double* basisVert = data.basisVert;
- const double* basisDerivVert = data.basisDerivVert;
- const double* basisQuad = data.basisQuad;
- const double* basisDerivQuad = data.basisDerivQuad;
- const double* quadPtsRef = data.quadPtsRef;
- const double* quadWts = data.quadWts;
-
- const int numVertices = data.numVertices;
- const int numCells = data.numCells;
- const double* vertCoords = data.vertices;
- const int* cells = data.cells;
- const double* quadPts = data.quadPts;
- const double* jacobianVert = data.jacobianVert;
- const double* jacobianDetVert = data.jacobianDetVert;
-
- const double minJacobian = 1.0e-06;
-
- pQuad->minJacobian(minJacobian);
- pQuad->initialize(basisVert, basisDerivVert,
- basisQuad, basisDerivQuad, quadPtsRef, quadWts,
- cellDim, numBasis, numQuadPts, spaceDim);
-
- // Create mesh with test cell
- typedef ALE::Mesh Mesh;
- typedef ALE::Mesh::sieve_type sieve_type;
- ALE::Obj<Mesh> mesh = new Mesh(PETSC_COMM_WORLD, cellDim);
- ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
-
- const bool interpolate = false;
- ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
- (int*) cells, numVertices, interpolate, numBasis);
- mesh->setSieve(sieve);
- mesh->stratify();
- ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
-
- // Check values from computeGeometryVert()
- const ALE::Obj<Mesh::label_sequence>& elements = mesh->heightStratum(0);
- const Mesh::label_sequence::iterator e_iter = elements->begin();
- const ALE::Obj<Mesh::real_section_type>& coordinates =
- mesh->getRealSection("coordinates");
- pQuad->computeGeometryVert(mesh, coordinates, *e_iter);
-
- CPPUNIT_ASSERT(1 == numCells);
-
- const double tolerance = 1.0e-06;
- int size = numVertices * cellDim * spaceDim;
- for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianVert[i], pQuad->_jacobianVert[i],
- tolerance);
-
- size = numVertices;
- for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianDetVert[i],
- pQuad->_jacobianDetVert[i],
- tolerance);
-} // testComputeGeometryVert
-
-// ----------------------------------------------------------------------
// Test initialize() & computeGeometry()
void
-pylith::feassemble::TestQuadrature::_testComputeGeometryQuad(
- Quadrature* pQuad,
- const QuadratureData& data) const
+pylith::feassemble::TestQuadrature::_testComputeGeometry(Quadrature* pQuad,
+ const QuadratureData& data) const
{ // testComputeGeometry
const int cellDim = data.cellDim;
const int numBasis = data.numBasis;
const int numQuadPts = data.numQuadPts;
const int spaceDim = data.spaceDim;
- const double* basisVert = data.basisVert;
- const double* basisDerivVert = data.basisDerivVert;
- const double* basisQuad = data.basisQuad;
- const double* basisDerivQuad = data.basisDerivQuad;
+ const double* basis = data.basis;
+ const double* basisDeriv = data.basisDeriv;
const double* quadPtsRef = data.quadPtsRef;
const double* quadWts = data.quadWts;
@@ -320,22 +229,21 @@
const double* vertCoords = data.vertices;
const int* cells = data.cells;
const double* quadPts = data.quadPts;
- const double* jacobianQuad = data.jacobianQuad;
- const double* jacobianInvQuad = data.jacobianInvQuad;
- const double* jacobianDetQuad = data.jacobianDetQuad;
+ const double* jacobian = data.jacobian;
+ const double* jacobianInv = data.jacobianInv;
+ const double* jacobianDet = data.jacobianDet;
const double minJacobian = 1.0e-06;
pQuad->minJacobian(minJacobian);
- pQuad->initialize(basisVert, basisDerivVert,
- basisQuad, basisDerivQuad, quadPtsRef, quadWts,
+ pQuad->initialize(basis, basisDeriv, quadPtsRef, quadWts,
cellDim, numBasis, numQuadPts, spaceDim);
// Create mesh with test cell
- typedef ALE::Mesh Mesh;
- typedef ALE::Mesh::sieve_type sieve_type;
ALE::Obj<Mesh> mesh = new Mesh(PETSC_COMM_WORLD, cellDim);
+ CPPUNIT_ASSERT(!mesh.isNull());
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
+ CPPUNIT_ASSERT(!sieve.isNull());
const bool interpolate = false;
ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
@@ -345,11 +253,13 @@
ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
// Check values from computeGeometry()
- const ALE::Obj<Mesh::label_sequence>& elements = mesh->heightStratum(0);
- const Mesh::label_sequence::iterator e_iter = elements->begin();
+ const ALE::Obj<Mesh::label_sequence>& cellsMesh = mesh->heightStratum(0);
+ CPPUNIT_ASSERT(!cellsMesh.isNull());
+ const Mesh::label_sequence::iterator e_iter = cellsMesh->begin();
const ALE::Obj<Mesh::real_section_type>& coordinates =
mesh->getRealSection("coordinates");
- pQuad->computeGeometryQuad(mesh, coordinates, *e_iter);
+ CPPUNIT_ASSERT(!coordinates.isNull());
+ pQuad->computeGeometry(mesh, coordinates, *e_iter);
CPPUNIT_ASSERT(1 == numCells);
@@ -360,21 +270,19 @@
size = numQuadPts * cellDim * spaceDim;
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianQuad[i], pQuad->_jacobianQuad[i],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobian[i], pQuad->_jacobian[i],
tolerance);
size = numQuadPts * spaceDim * cellDim;
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianInvQuad[i],
- pQuad->_jacobianInvQuad[i],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianInv[i], pQuad->_jacobianInv[i],
tolerance);
size = numQuadPts;
for (int i=0; i < size; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianDetQuad[i],
- pQuad->_jacobianDetQuad[i],
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(jacobianDet[i], pQuad->_jacobianDet[i],
tolerance);
-} // testComputeGeometryQuad
+} // testComputeGeometry
// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,22 +59,14 @@
// PROTECTED METHODS //////////////////////////////////////////////////
protected :
- /** Test initialize() & computeGeometryVert()
+ /** Test initialize() & computeGeometry()
*
* @param pQuad Pointer to quadrature
* @param data Data for testing quadrature
*/
- void _testComputeGeometryVert(Quadrature* pQuad,
- const QuadratureData& data) const;
+ void _testComputeGeometry(Quadrature* pQuad,
+ const QuadratureData& data) const;
- /** Test initialize() & computeGeometryQuad()
- *
- * @param pQuad Pointer to quadrature
- * @param data Data for testing quadrature
- */
- void _testComputeGeometryQuad(Quadrature* pQuad,
- const QuadratureData& data) const;
-
}; // class TestQuadrature
#endif // pylith_feassemble_testquadrature_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,8 +38,7 @@
Quadrature1D q;
QuadratureData1DLinear data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinear
// ----------------------------------------------------------------------
@@ -50,8 +49,7 @@
Quadrature1D q;
QuadratureData1DQuadratic data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testQuadratic
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din2D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din2D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din2D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,8 +38,7 @@
Quadrature1Din2D q;
QuadratureData1Din2DLinear data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinear
// ----------------------------------------------------------------------
@@ -50,8 +49,7 @@
Quadrature1Din2D q;
QuadratureData1Din2DQuadratic data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testQuadratic
// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din3D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature1Din3D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,8 +38,7 @@
Quadrature1Din3D q;
QuadratureData1Din3DLinear data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinear
// ----------------------------------------------------------------------
@@ -50,8 +49,7 @@
Quadrature1Din3D q;
QuadratureData1Din3DQuadratic data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testQuadratic
// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,8 +38,7 @@
Quadrature2D q;
QuadratureData2DLinear data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinear
// ----------------------------------------------------------------------
@@ -50,8 +49,7 @@
Quadrature2D q;
QuadratureData2DQuadratic data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testQuadratic
// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2Din3D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature2Din3D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -41,8 +41,7 @@
Quadrature2Din3D q;
QuadratureData2Din3DLinearXYZ data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinearXYZ
// ----------------------------------------------------------------------
@@ -53,8 +52,7 @@
Quadrature2Din3D q;
QuadratureData2Din3DLinearXY data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinearXY
// ----------------------------------------------------------------------
@@ -65,8 +63,7 @@
Quadrature2Din3D q;
QuadratureData2Din3DLinearYZ data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinearYZ
// ----------------------------------------------------------------------
@@ -77,8 +74,7 @@
Quadrature2Din3D q;
QuadratureData2Din3DLinearXZ data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinearXZ
// ----------------------------------------------------------------------
@@ -89,8 +85,7 @@
Quadrature2Din3D q;
QuadratureData2Din3DQuadratic data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testQuadratic
// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature3D.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature3D.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature3D.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,8 +38,7 @@
Quadrature3D q;
QuadratureData3DLinear data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testLinear
// ----------------------------------------------------------------------
@@ -50,8 +49,7 @@
Quadrature3D q;
QuadratureData3DQuadratic data;
- _testComputeGeometryVert(&q, data);
- _testComputeGeometryQuad(&q, data);
+ _testComputeGeometry(&q, data);
} // testQuadratic
// End of file
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DLinear.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -32,9 +32,6 @@
def N1p(p):
return +0.5
-def verticesRef():
- return [-1.0, 1.0]
-
# ----------------------------------------------------------------------
# Quadrature1DLinear class
@@ -68,53 +65,27 @@
# PRIVATE METHODS ////////////////////////////////////////////////////
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and their derivatives at reference vertices.
- """
-
- self.basisVert = numpy.zeros( (self.numBasis, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivVert = numpy.zeros( (self.numBasis,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iVertex = 0
- for v in verticesRef():
- # Basis functions at vertices
- basis = numpy.array([N0(v), N1(v)], dtype=numpy.float64)
- self.basisVert[iVertex,:] = basis.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- deriv = numpy.array([[N0p(v)], [N1p(v)]], dtype=numpy.float64)
- self.basisDerivVert[iVertex,:] = deriv.reshape((self.numBasis,
- self.cellDim))
-
- iVertex += 1
- return
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and their derivatives at quadrature points.
"""
- self.basisQuad = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivQuad = numpy.zeros( (self.numQuadPts,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
+ self.basis = numpy.zeros( (self.numQuadPts, self.numBasis),
+ dtype=numpy.float64)
+ self.basisDeriv = numpy.zeros( (self.numQuadPts,
+ self.numBasis, self.cellDim),
+ dtype=numpy.float64)
iQuad = 0
for q in self.quadPtsRef:
# Basis functions at quadrature points
basis = numpy.array([N0(q), N1(q)], dtype=numpy.float64)
- self.basisQuad[iQuad,:] = basis.reshape( (self.numBasis,) )
+ self.basis[iQuad,:] = basis.reshape( (self.numBasis,) )
# Derivatives of basis functions at quadrature points
deriv = numpy.array([[N0p(q)], [N1p(q)]], dtype=numpy.float64)
- self.basisDerivQuad[iQuad,:] = deriv.reshape((self.numBasis,
- self.cellDim))
+ self.basisDeriv[iQuad,:] = deriv.reshape((self.numBasis,
+ self.cellDim))
iQuad += 1
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature1DQuadratic.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -38,9 +38,6 @@
def N2p(p):
return +0.5*(1.0+p) + 0.5*p
-def verticesRef():
- return [-1.0, 0.0, 1.0]
-
# ----------------------------------------------------------------------
# Quadrature1DQuadratic class
@@ -78,54 +75,27 @@
# PRIVATE METHODS ////////////////////////////////////////////////////
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and their derivatives at vertices.
- """
-
- self.basisVert = numpy.zeros( (self.numBasis, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivVert = numpy.zeros( (self.numBasis,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iVertex = 0
- for v in verticesRef():
- # Basis functions at vertices
- basis = numpy.array([N0(v), N1(v), N2(v)], dtype=numpy.float64)
- self.basisVert[iVertex] = basis.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at vertices
- deriv = numpy.array([[N0p(v)], [N1p(v)], [N2p(v)]],
- dtype=numpy.float64)
- self.basisDerivVert[iVertex] = deriv.reshape((self.numBasis,
- self.cellDim))
-
- iVertex += 1
- return
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and their derivatives at quadrature points.
"""
- self.basisQuad = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivQuad = numpy.zeros( (self.numQuadPts,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
+ self.basis = numpy.zeros( (self.numQuadPts, self.numBasis),
+ dtype=numpy.float64)
+ self.basisDeriv = numpy.zeros( (self.numQuadPts,
+ self.numBasis, self.cellDim),
+ dtype=numpy.float64)
iQuad = 0
for q in self.quadPtsRef:
# Basis functions at quadrature points
basis = numpy.array([N0(q), N1(q), N2(q)], dtype=numpy.float64)
- self.basisQuad[iQuad] = basis.reshape( (self.numBasis,) )
+ self.basis[iQuad] = basis.reshape( (self.numBasis,) )
# Derivatives of basis functions at quadrature points
deriv = numpy.array([[N0p(q)], [N1p(q)], [N2p(q)]],
dtype=numpy.float64)
- self.basisDerivQuad[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
+ self.basisDeriv[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
iQuad += 1
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DLinear.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -47,11 +47,6 @@
def N2q(p):
return 1.0
-def verticesRef():
- return [ [0.0, 0.0],
- [1.0, 0.0],
- [0.0, 1.0] ]
-
# ----------------------------------------------------------------------
# Quadrature2DLinear class
@@ -85,42 +80,14 @@
return
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and their derivatives at vertices.
- """
-
- self.basisVert = numpy.zeros( (self.numBasis, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivVert = numpy.zeros( (self.numBasis,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iVertex = 0
- for v in verticesRef():
- # Basis functions at quadrature points
- basis = numpy.array([N0(v), N1(v), N2(v)], dtype=numpy.float64)
- self.basisVert[iVertex] = basis.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at quadrature points
- deriv = numpy.array([[N0p(v), N0q(v)],
- [N1p(v), N1q(v)],
- [N2p(v), N2q(v)]], dtype=numpy.float64)
- self.basisDerivVert[iVertex] = deriv.reshape((self.numBasis,
- self.cellDim))
-
- iVertex += 1
- return
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and their derivatives at quadrature points.
"""
- self.basisQuad = numpy.zeros( (self.numQuadPts, self.numBasis),
+ self.basis = numpy.zeros( (self.numQuadPts, self.numBasis),
dtype=numpy.float64)
- self.basisDerivQuad = numpy.zeros( (self.numQuadPts,
+ self.basisDeriv = numpy.zeros( (self.numQuadPts,
self.numBasis, self.cellDim),
dtype=numpy.float64)
@@ -128,13 +95,13 @@
for q in self.quadPtsRef:
# Basis functions at quadrature points
basis = numpy.array([N0(q), N1(q), N2(q)], dtype=numpy.float64)
- self.basisQuad[iQuad] = basis.reshape( (self.numBasis,) )
-
+ self.basis[iQuad] = basis.reshape( (self.numBasis,) )
+
# Derivatives of basis functions at quadrature points
deriv = numpy.array([[N0p(q), N0q(q)],
[N1p(q), N1q(q)],
[N2p(q), N2q(q)]], dtype=numpy.float64)
- self.basisDerivQuad[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
+ self.basisDeriv[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
iQuad += 1
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature2DQuadratic.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -74,14 +74,6 @@
def N5q(p):
return -8.0*p[1]-4.0*p[0]+4.0
-def verticesRef():
- return [ [0.0, 0.0],
- [1.0, 0.0],
- [0.0, 1.0],
- [0.5, 0.0],
- [0.0, 0.5],
- [0.5, 0.5] ]
-
# ----------------------------------------------------------------------
# Quadrature2DQuadratic class
@@ -124,56 +116,23 @@
return
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and their derivatives at vertices.
- """
-
- self.basisVert = numpy.zeros( (self.numBasis, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivVert = numpy.zeros( (self.numBasis,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iVertex = 0
- for v in verticesRef():
- # Basis functions at vertices
- basis = numpy.array([N0(v), N1(v), N2(v), N3(v), N4(v), N5(v)],
- dtype=numpy.float64)
- self.basisVert[iVertex] = basis.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at vertices
- deriv = numpy.array([[N0p(v), N0q(v)],
- [N1p(v), N1q(v)],
- [N2p(v), N2q(v)],
- [N3p(v), N3q(v)],
- [N4p(v), N4q(v)],
- [N5p(v), N5q(v)]],
- dtype=numpy.float64)
- self.basisDerivVert[iVertex] = deriv.reshape((self.numBasis,
- self.cellDim))
-
- iVertex += 1
- return
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and their derivatives at quadrature points.
"""
- self.basisQuad = numpy.zeros( (self.numQuadPts, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivQuad = numpy.zeros( (self.numQuadPts,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
+ self.basis = numpy.zeros( (self.numQuadPts, self.numBasis),
+ dtype=numpy.float64)
+ self.basisDeriv = numpy.zeros( (self.numQuadPts,
+ self.numBasis, self.cellDim),
+ dtype=numpy.float64)
iQuad = 0
for q in self.quadPtsRef:
# Basis functions at quadrature points
basis = numpy.array([N0(q), N1(q), N2(q), N3(q), N4(q), N5(q)],
dtype=numpy.float64)
- self.basisQuad[iQuad] = basis.reshape( (self.numBasis,) )
+ self.basis[iQuad] = basis.reshape( (self.numBasis,) )
# Derivatives of basis functions at quadrature points
deriv = numpy.array([[N0p(q), N0q(q)],
@@ -183,7 +142,7 @@
[N4p(q), N4q(q)],
[N5p(q), N5q(q)]],
dtype=numpy.float64)
- self.basisDerivQuad[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
+ self.basisDeriv[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
iQuad += 1
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DLinear.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -68,13 +68,7 @@
def N3r(p):
return 1.0
-def verticesRef():
- return [ [0.0, 0.0, 0.0],
- [1.0, 0.0, 0.0],
- [0.0, 1.0, 0.0],
- [0.0, 0.0, 1.0] ]
-
# ----------------------------------------------------------------------
# Quadrature3DLinear class
@@ -110,44 +104,14 @@
return
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and their derivatives at vertices.
- """
-
- self.basisVert = numpy.zeros( (self.numBasis, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivVert = numpy.zeros( (self.numBasis,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iVertex = 0
- for v in verticesRef():
- # Basis functions at vertices
- basis = numpy.array([N0(v), N1(v), N2(v), N3(v)], dtype=numpy.float64)
- self.basisVert[iVertex] = basis.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at vertices
- deriv = numpy.array([[N0p(v), N0q(v), N0r(v)],
- [N1p(v), N1q(v), N1r(v)],
- [N2p(v), N2q(v), N2r(v)],
- [N3p(v), N3q(v), N3r(v)]],
- dtype=numpy.float64)
- self.basisDerivVert[iVertex] = deriv.reshape((self.numBasis,
- self.cellDim))
-
- iVertex += 1
- return
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and their derivatives at quadrature points.
"""
- self.basisQuad = numpy.zeros( (self.numQuadPts, self.numBasis),
+ self.basis = numpy.zeros( (self.numQuadPts, self.numBasis),
dtype=numpy.float64)
- self.basisDerivQuad = numpy.zeros( (self.numQuadPts,
+ self.basisDeriv = numpy.zeros( (self.numQuadPts,
self.numBasis, self.cellDim),
dtype=numpy.float64)
@@ -155,7 +119,7 @@
for q in self.quadPtsRef:
# Basis functions at quadrature points
basis = numpy.array([N0(q), N1(q), N2(q), N3(q)], dtype=numpy.float64)
- self.basisQuad[iQuad] = basis.reshape( (self.numBasis,) )
+ self.basis[iQuad] = basis.reshape( (self.numBasis,) )
# Derivatives of basis functions at quadrature points
deriv = numpy.array([[N0p(q), N0q(q), N0r(q)],
@@ -163,7 +127,7 @@
[N2p(q), N2q(q), N2r(q)],
[N3p(q), N3q(q), N3r(q)]],
dtype=numpy.float64)
- self.basisDerivQuad[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
+ self.basisDeriv[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
iQuad += 1
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/Quadrature3DQuadratic.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -140,17 +140,6 @@
def N9r(p):
return 4.0*p[0]
-def verticesRef():
- return [ [0.0, 0.0, 0.0],
- [1.0, 0.0, 0.0],
- [0.0, 1.0, 0.0],
- [0.0, 0.0, 1.0],
- [0.5, 0.0, 0.0],
- [0.0, 0.5, 0.0],
- [0.0, 0.0, 0.5],
- [0.5, 0.5, 0.0],
- [0.0, 0.5, 0.5],
- [0.5, 0.0, 0.5] ]
# ----------------------------------------------------------------------
@@ -202,52 +191,14 @@
return
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and their derivatives at vertices.
- """
-
- self.basisVert = numpy.zeros( (self.numBasis, self.numBasis),
- dtype=numpy.float64)
- self.basisDerivVert = numpy.zeros( (self.numBasis,
- self.numBasis, self.cellDim),
- dtype=numpy.float64)
-
- iVertex = 0
- for v in verticesRef():
- # Basis functions at vertices
- basis = numpy.array([N0(v), N1(v), N2(v), N3(v), N4(v),
- N5(v), N6(v), N7(v), N8(v), N9(v)],
- dtype=numpy.float64)
- self.basisVert[iVertex] = basis.reshape( (self.numBasis,) )
-
- # Derivatives of basis functions at vertices
- deriv = numpy.array([[N0p(v), N0q(v), N0r(v)],
- [N1p(v), N1q(v), N1r(v)],
- [N2p(v), N2q(v), N2r(v)],
- [N3p(v), N3q(v), N3r(v)],
- [N4p(v), N4q(v), N4r(v)],
- [N5p(v), N5q(v), N5r(v)],
- [N6p(v), N6q(v), N6r(v)],
- [N7p(v), N7q(v), N7r(v)],
- [N8p(v), N8q(v), N8r(v)],
- [N9p(v), N9q(v), N9r(v)]],
- dtype=numpy.float64)
- self.basisDerivVert[iVertex] = deriv.reshape((self.numBasis,
- self.cellDim))
-
- iVertex += 1
- return
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and their derivatives at quadrature points.
"""
- self.basisQuad = numpy.zeros( (self.numQuadPts, self.numBasis),
+ self.basis = numpy.zeros( (self.numQuadPts, self.numBasis),
dtype=numpy.float64)
- self.basisDerivQuad = numpy.zeros( (self.numQuadPts,
+ self.basisDeriv = numpy.zeros( (self.numQuadPts,
self.numBasis, self.cellDim),
dtype=numpy.float64)
@@ -257,7 +208,7 @@
basis = numpy.array([N0(q), N1(q), N2(q), N3(q), N4(q),
N5(q), N6(q), N7(q), N8(q), N9(q)],
dtype=numpy.float64)
- self.basisQuad[iQuad] = basis.reshape( (self.numBasis,) )
+ self.basis[iQuad] = basis.reshape( (self.numBasis,) )
# Derivatives of basis functions at quadrature points
deriv = numpy.array([[N0p(q), N0q(q), N0r(q)],
@@ -271,7 +222,7 @@
[N8p(q), N8q(q), N8r(q)],
[N9p(q), N9q(q), N9r(q)]],
dtype=numpy.float64)
- self.basisDerivQuad[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
+ self.basisDeriv[iQuad] = deriv.reshape((self.numBasis, self.cellDim))
iQuad += 1
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureApp.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -69,18 +69,14 @@
self.quadPtsRef = None
self.quadWts = None
- self.basisVert = None
- self.basisDerivVert = None
- self.basisQuad = None
- self.basisDerivQuad = None
+ self.basis = None
+ self.basisDeriv = None
# Computed quadrature information
self.quadPts = None
- self.jacobianVert = None
- self.jacobianDetVert = None
- self.jacobianQuad = None
- self.jacobianDetQuad = None
- self.jacobianInvQuad = None
+ self.jacobian = None
+ self.jacobianDet = None
+ self.jacobianInv = None
return
@@ -88,52 +84,32 @@
"""
Run the application.
"""
- self.calculateBasisVert()
- self.calculateJacobianVert()
+ self.calculateBasis()
+ self.calculateJacobian()
- self.calculateBasisQuad()
- self.calculateJacobianQuad()
-
# Quadrature points in cell
- self.quadPts = numpy.dot(self.basisQuad, self.vertices)
+ self.quadPts = numpy.dot(self.basis, self.vertices)
self._initData()
self.data.write(self.name)
return
- def calculateBasisVert(self):
+ def calculateBasis(self):
"""
- Calculate basis functions and derivatives at vertoces.
- """
- raise NotImplementedError
-
-
- def calculateBasisQuad(self):
- """
Calculate basis functions and derivatives at quadrature points.
"""
raise NotImplementedError
- def calculateJacobianVert(self):
+ def calculateJacobian(self):
"""
- Calculate Jacobian and its determinant at vertices.
- """
- import feutils
- (self.jacobianVert, self.jacobianDetVert) = \
- feutils.calculateJacobianVert(self, self.vertices)
- return
-
-
- def calculateJacobianQuad(self):
- """
Calculate Jacobian, its determinant, and its inverse at quadrature
pts plus coordinates of quadrature points in the cell.
"""
import feutils
- (self.jacobianQuad, self.jacobianInvQuad, self.jacobianDetQuad) = \
- feutils.calculateJacobianQuad(self, self.vertices)
+ (self.jacobian, self.jacobianInv, self.jacobianDet) = \
+ feutils.calculateJacobian(self, self.vertices)
return
@@ -179,33 +155,20 @@
values=self.quadPts,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_basisVert",
- values=self.basisVert,
+ self.data.addArray(vtype="double", name="_basis",
+ values=self.basis,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_basisDerivVert",
- values=self.basisDerivVert,
+ self.data.addArray(vtype="double", name="_basisDeriv",
+ values=self.basisDeriv,
format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_jacobianVert",
- values=self.jacobianVert,
+ self.data.addArray(vtype="double", name="_jacobian",
+ values=self.jacobian,
format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_jacobianDetVert",
- values=self.jacobianDetVert,
- format="%16.8e", ncols=self.numVertices)
-
- self.data.addArray(vtype="double", name="_basisQuad",
- values=self.basisQuad,
- format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_basisDerivQuad",
- values=self.basisDerivQuad,
- format="%16.8e", ncols=self.cellDim)
- self.data.addArray(vtype="double", name="_jacobianQuad",
- values=self.jacobianQuad,
- format="%16.8e", ncols=self.spaceDim)
- self.data.addArray(vtype="double", name="_jacobianDetQuad",
- values=self.jacobianDetQuad,
+ self.data.addArray(vtype="double", name="_jacobianDet",
+ values=self.jacobianDet,
format="%16.8e", ncols=self.numQuadPts)
- self.data.addArray(vtype="double", name="_jacobianInvQuad",
- values=self.jacobianInvQuad,
+ self.data.addArray(vtype="double", name="_jacobianInv",
+ values=self.jacobianInv,
format="%16.8e", ncols=self.cellDim)
return
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -26,15 +26,11 @@
quadPtsRef(0),
quadWts(0),
quadPts(0),
- basisVert(0),
- basisDerivVert(0),
- jacobianVert(0),
- jacobianDetVert(0),
- basisQuad(0),
- basisDerivQuad(0),
- jacobianQuad(0),
- jacobianDetQuad(0),
- jacobianInvQuad(0)
+ basis(0),
+ basisDeriv(0),
+ jacobian(0),
+ jacobianDet(0),
+ jacobianInv(0)
{ // constructor
} // constructor
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -48,17 +48,12 @@
double* quadWts; ///< Weights of quadrature points
double* quadPts; ///< Coordinates of quad pts in cell
- double* basisVert; ///< Basis fns at vertices
- double* basisDerivVert; ///< Derivatices of basis fns at vertices
- double* jacobianVert; ///< Jacobian at vertices
- double* jacobianDetVert; ///< Determinant at vertices
+ double* basis; ///< Basis fns at quadrature points
+ double* basisDeriv; ///< Derivatices of basis fns at quad pts
+ double* jacobian; ///< Jacobian at quadrature points
+ double* jacobianDet; ///< Determinant of quadrature points
+ double* jacobianInv; ///< Inverse of Jacobian at quadruature points
- double* basisQuad; ///< Basis fns at quadrature points
- double* basisDerivQuad; ///< Derivatices of basis fns at quad pts
- double* jacobianQuad; ///< Jacobian at quadrature points
- double* jacobianDetQuad; ///< Determinant of quadrature points
- double* jacobianInvQuad; ///< Inverse of Jacobian at quadruature points
-
};
#endif // pylith_feassemble_quadraturedata_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -48,48 +48,25 @@
8.75000000e-01,
};
-const double pylith::feassemble::QuadratureData1DLinear::_basisVert[] = {
- 1.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DLinear::_basisDerivVert[] = {
- -5.00000000e-01,
+const double pylith::feassemble::QuadratureData1DLinear::_basis[] = {
5.00000000e-01,
- -5.00000000e-01,
5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1DLinear::_jacobianVert[] = {
- 1.12500000e+00,
- 1.12500000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DLinear::_jacobianDetVert[] = {
- 1.12500000e+00, 1.12500000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DLinear::_basisQuad[] = {
- 5.00000000e-01,
- 5.00000000e-01,
-};
-
-const double pylith::feassemble::QuadratureData1DLinear::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData1DLinear::_basisDeriv[] = {
-5.00000000e-01,
5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1DLinear::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData1DLinear::_jacobian[] = {
1.12500000e+00,
};
-const double pylith::feassemble::QuadratureData1DLinear::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData1DLinear::_jacobianDet[] = {
1.12500000e+00,
};
-const double pylith::feassemble::QuadratureData1DLinear::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData1DLinear::_jacobianInv[] = {
8.88888889e-01,
};
@@ -106,15 +83,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData1DLinear::~QuadratureData1DLinear(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DLinear.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata1dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -51,41 +51,7 @@
1.52451905e+00,
};
-const double pylith::feassemble::QuadratureData1DQuadratic::_basisVert[] = {
- 1.00000000e+00,
- 0.00000000e+00,
- -0.00000000e+00,
- -0.00000000e+00,
- 1.00000000e+00,
- 0.00000000e+00,
- -0.00000000e+00,
- 0.00000000e+00,
- 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DQuadratic::_basisDerivVert[] = {
- -1.50000000e+00,
- 2.00000000e+00,
- -5.00000000e-01,
- -5.00000000e-01,
- -0.00000000e+00,
- 5.00000000e-01,
- 5.00000000e-01,
- -2.00000000e+00,
- 1.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianVert[] = {
- 1.12500000e+00,
- 1.12500000e+00,
- 1.12500000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianDetVert[] = {
- 1.12500000e+00, 1.12500000e+00, 1.12500000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1DQuadratic::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData1DQuadratic::_basis[] = {
4.55341801e-01,
6.66666667e-01,
-1.22008468e-01,
@@ -94,7 +60,7 @@
4.55341801e-01,
};
-const double pylith::feassemble::QuadratureData1DQuadratic::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData1DQuadratic::_basisDeriv[] = {
-1.07735027e+00,
1.15470054e+00,
-7.73502692e-02,
@@ -103,16 +69,16 @@
1.07735027e+00,
};
-const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData1DQuadratic::_jacobian[] = {
1.12500000e+00,
1.12500000e+00,
};
-const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianDet[] = {
1.12500000e+00, 1.12500000e+00,
};
-const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData1DQuadratic::_jacobianInv[] = {
8.88888889e-01,
8.88888889e-01,
};
@@ -130,15 +96,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData1DQuadratic::~QuadratureData1DQuadratic(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1DQuadratic.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata1dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -48,48 +48,25 @@
2.50000000e-01, -1.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DLinear::_basisVert[] = {
- 1.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DLinear::_basisDerivVert[] = {
- -5.00000000e-01,
+const double pylith::feassemble::QuadratureData1Din2DLinear::_basis[] = {
5.00000000e-01,
- -5.00000000e-01,
5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianVert[] = {
- 4.50000000e-01, 4.00000000e-01,
- 4.50000000e-01, 4.00000000e-01,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianDetVert[] = {
- 6.02079729e-01, 6.02079729e-01,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DLinear::_basisQuad[] = {
- 5.00000000e-01,
- 5.00000000e-01,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DLinear::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DLinear::_basisDeriv[] = {
-5.00000000e-01,
5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobian[] = {
4.50000000e-01, 4.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianDet[] = {
6.02079729e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DLinear::_jacobianInv[] = {
2.22222222e+00,
2.50000000e+00,
};
@@ -107,15 +84,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData1Din2DLinear::~QuadratureData1Din2DLinear(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DLinear.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata1din2dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -51,41 +51,7 @@
5.43140954e-01, 6.42734410e-02,
};
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_basisVert[] = {
- 1.00000000e+00,
- 0.00000000e+00,
- -0.00000000e+00,
- -0.00000000e+00,
- 1.00000000e+00,
- 0.00000000e+00,
- -0.00000000e+00,
- 0.00000000e+00,
- 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_basisDerivVert[] = {
- -1.50000000e+00,
- 2.00000000e+00,
- -5.00000000e-01,
- -5.00000000e-01,
- -0.00000000e+00,
- 5.00000000e-01,
- 5.00000000e-01,
- -2.00000000e+00,
- 1.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianVert[] = {
- 5.50000000e-01, 2.00000000e-01,
- 4.50000000e-01, 4.00000000e-01,
- 3.50000000e-01, 6.00000000e-01,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianDetVert[] = {
- 5.85234996e-01, 6.02079729e-01, 6.94622199e-01,
-};
-
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DQuadratic::_basis[] = {
4.55341801e-01,
6.66666667e-01,
-1.22008468e-01,
@@ -94,7 +60,7 @@
4.55341801e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DQuadratic::_basisDeriv[] = {
-1.07735027e+00,
1.15470054e+00,
-7.73502692e-02,
@@ -103,16 +69,16 @@
1.07735027e+00,
};
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobian[] = {
5.07735027e-01, 2.84529946e-01,
3.92264973e-01, 5.15470054e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianDet[] = {
5.82024181e-01, 6.47750867e-01,
};
-const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData1Din2DQuadratic::_jacobianInv[] = {
1.96953125e+00,
3.51456855e+00,
2.54929721e+00,
@@ -132,15 +98,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData1Din2DQuadratic::~QuadratureData1Din2DQuadratic(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din2DQuadratic.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata1din2dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -48,48 +48,25 @@
2.50000000e-01, 2.50000000e-01, 5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din3DLinear::_basisVert[] = {
- 1.00000000e+00,
- 0.00000000e+00,
- 0.00000000e+00,
- 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DLinear::_basisDerivVert[] = {
- -5.00000000e-01,
+const double pylith::feassemble::QuadratureData1Din3DLinear::_basis[] = {
5.00000000e-01,
- -5.00000000e-01,
5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianVert[] = {
- -7.50000000e-01, 1.75000000e+00, 2.50000000e+00,
- -7.50000000e-01, 1.75000000e+00, 2.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianDetVert[] = {
- 3.14245127e+00, 3.14245127e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DLinear::_basisQuad[] = {
- 5.00000000e-01,
- 5.00000000e-01,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DLinear::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DLinear::_basisDeriv[] = {
-5.00000000e-01,
5.00000000e-01,
};
-const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobian[] = {
-7.50000000e-01, 1.75000000e+00, 2.50000000e+00,
};
-const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianDet[] = {
3.14245127e+00,
};
-const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DLinear::_jacobianInv[] = {
-1.33333333e+00,
5.71428571e-01,
4.00000000e-01,
@@ -108,15 +85,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData1Din3DLinear::~QuadratureData1Din3DLinear(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DLinear.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata1din3dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -51,41 +51,7 @@
-1.49679369e-01, 1.29369630e+00, 2.14337567e+00,
};
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_basisVert[] = {
- 1.00000000e+00,
- 0.00000000e+00,
- -0.00000000e+00,
- -0.00000000e+00,
- 1.00000000e+00,
- 0.00000000e+00,
- -0.00000000e+00,
- 0.00000000e+00,
- 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_basisDerivVert[] = {
- -1.50000000e+00,
- 2.00000000e+00,
- -5.00000000e-01,
- -5.00000000e-01,
- -0.00000000e+00,
- 5.00000000e-01,
- 5.00000000e-01,
- -2.00000000e+00,
- 1.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianVert[] = {
- -6.50000000e-01, 1.85000000e+00, 3.10000000e+00,
- -7.50000000e-01, 1.75000000e+00, 2.50000000e+00,
- -8.50000000e-01, 1.65000000e+00, 1.90000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianDetVert[] = {
- 3.66810578e+00, 3.14245127e+00, 2.65612500e+00,
-};
-
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DQuadratic::_basis[] = {
4.55341801e-01,
6.66666667e-01,
-1.22008468e-01,
@@ -94,7 +60,7 @@
4.55341801e-01,
};
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DQuadratic::_basisDeriv[] = {
-1.07735027e+00,
1.15470054e+00,
-7.73502692e-02,
@@ -103,16 +69,16 @@
1.07735027e+00,
};
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobian[] = {
-6.92264973e-01, 1.80773503e+00, 2.84641016e+00,
-8.07735027e-01, 1.69226497e+00, 2.15358984e+00,
};
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianDet[] = {
3.44226488e+00, 2.85554650e+00,
};
-const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData1Din3DQuadratic::_jacobianInv[] = {
-1.44453358e+00,
5.53178417e-01,
3.51319713e-01,
@@ -134,15 +100,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData1Din3DQuadratic::~QuadratureData1Din3DQuadratic(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData1Din3DQuadratic.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata1din3dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -49,58 +49,26 @@
-1.66666667e-01, -3.33333333e-02,
};
-const double pylith::feassemble::QuadratureData2DLinear::_basisVert[] = {
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData2DLinear::_basisDerivVert[] = {
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2DLinear::_jacobianVert[] = {
- 1.00000000e-01, 9.00000000e-01,
- -1.20000000e+00, 2.00000000e-01,
- 1.00000000e-01, 9.00000000e-01,
- -1.20000000e+00, 2.00000000e-01,
- 1.00000000e-01, 9.00000000e-01,
- -1.20000000e+00, 2.00000000e-01,
-};
-
-const double pylith::feassemble::QuadratureData2DLinear::_jacobianDetVert[] = {
- 1.10000000e+00, 1.10000000e+00, 1.10000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2DLinear::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2DLinear::_basis[] = {
3.33333333e-01, 3.33333333e-01,
3.33333333e-01,};
-const double pylith::feassemble::QuadratureData2DLinear::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2DLinear::_basisDeriv[] = {
-1.00000000e+00, -1.00000000e+00,
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2DLinear::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2DLinear::_jacobian[] = {
1.00000000e-01, 9.00000000e-01,
-1.20000000e+00, 2.00000000e-01,
};
-const double pylith::feassemble::QuadratureData2DLinear::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2DLinear::_jacobianDet[] = {
1.10000000e+00,
};
-const double pylith::feassemble::QuadratureData2DLinear::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2DLinear::_jacobianInv[] = {
1.81818182e-01, -8.18181818e-01,
1.09090909e+00, 9.09090909e-02,
};
@@ -118,15 +86,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2DLinear::~QuadratureData2DLinear(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DLinear.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -56,86 +56,7 @@
-6.94444444e-01, -6.38888889e-01,
};
-const double pylith::feassemble::QuadratureData2DQuadratic::_basisVert[] = {
- 1.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 1.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2DQuadratic::_basisDerivVert[] = {
- -3.00000000e+00, -3.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00,
- 4.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 4.00000000e+00,
- 1.00000000e+00, 1.00000000e+00,
- 3.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00,
- -4.00000000e+00, -4.00000000e+00,
- 0.00000000e+00, 4.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 3.00000000e+00,
- 0.00000000e+00, -0.00000000e+00,
- 4.00000000e+00, 0.00000000e+00,
- -4.00000000e+00, -4.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00,
- 0.00000000e+00, -2.00000000e+00,
- 0.00000000e+00, 2.00000000e+00,
- -0.00000000e+00, 2.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- 2.00000000e+00, -0.00000000e+00,
- 2.00000000e+00, 0.00000000e+00,
- -2.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -2.00000000e+00, -2.00000000e+00,
- 2.00000000e+00, 2.00000000e+00,
- -2.00000000e+00, -2.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianVert[] = {
- 2.00000000e+00, 4.00000000e-01,
- -5.00000000e-01, 1.50000000e+00,
- 2.00000000e+00, 2.00000000e+00,
- 1.50000000e+00, 2.30000000e+00,
- 4.00000000e+00, 1.20000000e+00,
- -5.00000000e-01, 1.50000000e+00,
- 2.00000000e+00, 1.20000000e+00,
- 5.00000000e-01, 1.90000000e+00,
- 3.00000000e+00, 8.00000000e-01,
- -5.00000000e-01, 1.50000000e+00,
- 3.00000000e+00, 1.60000000e+00,
- 5.00000000e-01, 1.90000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianDetVert[] = {
- 3.20000000e+00, 1.60000000e+00, 6.60000000e+00, 3.20000000e+00, 4.90000000e+00, 4.90000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2DQuadratic::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2DQuadratic::_basis[] = {
-1.11111111e-01, 2.22222222e-01,
-1.11111111e-01, 4.44444444e-01,
4.44444444e-01, 1.11111111e-01,
@@ -147,7 +68,7 @@
1.11111111e-01, 4.44444444e-01,
};
-const double pylith::feassemble::QuadratureData2DQuadratic::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2DQuadratic::_basisDeriv[] = {
3.33333333e-01, 3.33333333e-01,
1.66666667e+00, 0.00000000e+00,
0.00000000e+00, -3.33333333e-01,
@@ -168,7 +89,7 @@
-6.66666667e-01, 2.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2DQuadratic::_jacobian[] = {
2.33333333e+00, 1.60000000e+00,
8.33333333e-01, 2.03333333e+00,
3.33333333e+00, 1.20000000e+00,
@@ -177,11 +98,11 @@
-1.66666667e-01, 1.63333333e+00,
};
-const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianDet[] = {
3.41111111e+00, 5.64444444e+00, 3.94444444e+00,
};
-const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2DQuadratic::_jacobianInv[] = {
5.96091205e-01, -4.69055375e-01,
-2.44299674e-01, 6.84039088e-01,
2.89370079e-01, -2.12598425e-01,
@@ -203,15 +124,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2DQuadratic::~QuadratureData2DQuadratic(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2DQuadratic.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -49,58 +49,26 @@
3.33333333e-01, 3.33333333e-01, 0.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basisVert[] = {
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basisDerivVert[] = {
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianVert[] = {
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianDetVert[] = {
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basis[] = {
3.33333333e-01, 3.33333333e-01,
3.33333333e-01,};
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXY::_basisDeriv[] = {
-1.00000000e+00, -1.00000000e+00,
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobian[] = {
1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianDet[] = {
1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXY::_jacobianInv[] = {
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
0.00000000e+00, 0.00000000e+00,
@@ -119,15 +87,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2Din3DLinearXY::~QuadratureData2Din3DLinearXY(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXY.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2din3dlinearxy_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -49,58 +49,26 @@
8.33333333e-01, 1.66666667e-01, 1.16666667e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basisVert[] = {
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basisDerivVert[] = {
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianVert[] = {
- 2.50000000e+00, 2.50000000e+00, 5.00000000e-01,
- -1.50000000e+00, 4.00000000e+00, 4.50000000e+00,
- 2.50000000e+00, 2.50000000e+00, 5.00000000e-01,
- -1.50000000e+00, 4.00000000e+00, 4.50000000e+00,
- 2.50000000e+00, 2.50000000e+00, 5.00000000e-01,
- -1.50000000e+00, 4.00000000e+00, 4.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianDetVert[] = {
- 2.04603275e+01, 2.04603275e+01, 2.04603275e+01,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basis[] = {
3.33333333e-01, 3.33333333e-01,
3.33333333e-01,};
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_basisDeriv[] = {
-1.00000000e+00, -1.00000000e+00,
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobian[] = {
2.50000000e+00, 2.50000000e+00, 5.00000000e-01,
-1.50000000e+00, 4.00000000e+00, 4.50000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianDet[] = {
2.04603275e+01,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXYZ::_jacobianInv[] = {
2.90909091e-01, -1.81818182e-01,
1.09090909e-01, 1.81818182e-01,
-4.32432432e-01, 2.70270270e-01,
@@ -119,15 +87,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2Din3DLinearXYZ::~QuadratureData2Din3DLinearXYZ(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXYZ.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2din3dlinearxyz_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -49,58 +49,26 @@
-3.33333333e-01, 0.00000000e+00, 3.33333333e-01,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_basisVert[] = {
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_basisDerivVert[] = {
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianVert[] = {
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianDetVert[] = {
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_basis[] = {
3.33333333e-01, 3.33333333e-01,
3.33333333e-01,};
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_basisDeriv[] = {
-1.00000000e+00, -1.00000000e+00,
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobian[] = {
-1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianDet[] = {
1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearXZ::_jacobianInv[] = {
-1.00000000e+00, -0.00000000e+00,
0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
@@ -119,15 +87,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2Din3DLinearXZ::~QuadratureData2Din3DLinearXZ(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearXZ.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2din3dlinearxz_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -49,58 +49,26 @@
0.00000000e+00, 3.33333333e-01, 3.33333333e-01,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_basisVert[] = {
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_basisDerivVert[] = {
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianVert[] = {
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianDetVert[] = {
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_basis[] = {
3.33333333e-01, 3.33333333e-01,
3.33333333e-01,};
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_basisDeriv[] = {
-1.00000000e+00, -1.00000000e+00,
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobian[] = {
0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianDet[] = {
1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DLinearYZ::_jacobianInv[] = {
0.00000000e+00, 0.00000000e+00,
1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00,
@@ -119,15 +87,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2Din3DLinearYZ::~QuadratureData2Din3DLinearYZ(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DLinearYZ.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2din3dlinearyz_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -56,86 +56,7 @@
1.38888889e+00, 1.11111111e-01, -5.55555556e-02,
};
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_basisVert[] = {
- 1.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 1.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_basisDerivVert[] = {
- -3.00000000e+00, -3.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00,
- 4.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 4.00000000e+00,
- 1.00000000e+00, 1.00000000e+00,
- 3.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00,
- -4.00000000e+00, -4.00000000e+00,
- 0.00000000e+00, 4.00000000e+00,
- -0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 3.00000000e+00,
- 0.00000000e+00, -0.00000000e+00,
- 4.00000000e+00, 0.00000000e+00,
- -4.00000000e+00, -4.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00,
- 0.00000000e+00, -2.00000000e+00,
- 0.00000000e+00, 2.00000000e+00,
- -0.00000000e+00, 2.00000000e+00,
- -1.00000000e+00, -1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- 2.00000000e+00, -0.00000000e+00,
- 2.00000000e+00, 0.00000000e+00,
- -2.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00,
- -2.00000000e+00, -2.00000000e+00,
- 2.00000000e+00, 2.00000000e+00,
- -2.00000000e+00, -2.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianVert[] = {
- -1.30000000e+00, 3.30000000e+00, 3.00000000e-01,
- -2.30000000e+00, 3.00000000e-01, 2.30000000e+00,
- -1.70000000e+00, 3.70000000e+00, 7.00000000e-01,
- -2.30000000e+00, 3.00000000e-01, 2.30000000e+00,
- -1.30000000e+00, 3.30000000e+00, 3.00000000e-01,
- -2.70000000e+00, 7.00000000e-01, 2.70000000e+00,
- -1.50000000e+00, 3.50000000e+00, 5.00000000e-01,
- -2.30000000e+00, 3.00000000e-01, 2.30000000e+00,
- -1.30000000e+00, 3.30000000e+00, 3.00000000e-01,
- -2.50000000e+00, 5.00000000e-01, 2.50000000e+00,
- -1.50000000e+00, 3.50000000e+00, 5.00000000e-01,
- -2.50000000e+00, 5.00000000e-01, 2.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianDetVert[] = {
- 1.06480045e+01, 1.17549989e+01, 1.21235308e+01, 1.12008928e+01, 1.13850780e+01, 1.19373364e+01,
-};
-
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DQuadratic::_basis[] = {
-1.11111111e-01, 2.22222222e-01,
-1.11111111e-01, 4.44444444e-01,
4.44444444e-01, 1.11111111e-01,
@@ -147,7 +68,7 @@
1.11111111e-01, 4.44444444e-01,
};
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DQuadratic::_basisDeriv[] = {
3.33333333e-01, 3.33333333e-01,
1.66666667e+00, 0.00000000e+00,
0.00000000e+00, -3.33333333e-01,
@@ -168,7 +89,7 @@
-6.66666667e-01, 2.00000000e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobian[] = {
-1.56666667e+00, 3.56666667e+00, 5.66666667e-01,
-2.36666667e+00, 3.66666667e-01, 2.36666667e+00,
-1.36666667e+00, 3.36666667e+00, 3.66666667e-01,
@@ -177,11 +98,11 @@
-2.36666667e+00, 3.66666667e-01, 2.36666667e+00,
};
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianDet[] = {
1.16307065e+01, 1.18149623e+01, 1.10776050e+01,
};
-const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData2Din3DQuadratic::_jacobianInv[] = {
4.66101695e-02, -4.53389831e-01,
3.00847458e-01, -1.99152542e-01,
-4.45344130e-02, 4.33198381e-01,
@@ -206,15 +127,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData2Din3DQuadratic::~QuadratureData2Din3DQuadratic(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData2Din3DQuadratic.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata2din3dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -50,74 +50,28 @@
5.75000000e-01, -2.75000000e-01, 2.00000000e-01,
};
-const double pylith::feassemble::QuadratureData3DLinear::_basisVert[] = {
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData3DLinear::_basisDerivVert[] = {
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData3DLinear::_jacobianVert[] = {
- 2.50000000e+00, 5.00000000e-01, 1.00000000e-01,
- 1.50000000e+00, 9.00000000e-01, 2.00000000e-01,
- 3.00000000e-01, 1.50000000e+00, 2.50000000e+00,
- 2.50000000e+00, 5.00000000e-01, 1.00000000e-01,
- 1.50000000e+00, 9.00000000e-01, 2.00000000e-01,
- 3.00000000e-01, 1.50000000e+00, 2.50000000e+00,
- 2.50000000e+00, 5.00000000e-01, 1.00000000e-01,
- 1.50000000e+00, 9.00000000e-01, 2.00000000e-01,
- 3.00000000e-01, 1.50000000e+00, 2.50000000e+00,
- 2.50000000e+00, 5.00000000e-01, 1.00000000e-01,
- 1.50000000e+00, 9.00000000e-01, 2.00000000e-01,
- 3.00000000e-01, 1.50000000e+00, 2.50000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData3DLinear::_jacobianDetVert[] = {
- 3.22800000e+00, 3.22800000e+00, 3.22800000e+00, 3.22800000e+00,
-};
-
-const double pylith::feassemble::QuadratureData3DLinear::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData3DLinear::_basis[] = {
2.50000000e-01, 2.50000000e-01, 2.50000000e-01,
2.50000000e-01,};
-const double pylith::feassemble::QuadratureData3DLinear::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData3DLinear::_basisDeriv[] = {
-1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
};
-const double pylith::feassemble::QuadratureData3DLinear::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData3DLinear::_jacobian[] = {
2.50000000e+00, 5.00000000e-01, 1.00000000e-01,
1.50000000e+00, 9.00000000e-01, 2.00000000e-01,
3.00000000e-01, 1.50000000e+00, 2.50000000e+00,
};
-const double pylith::feassemble::QuadratureData3DLinear::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData3DLinear::_jacobianDet[] = {
3.22800000e+00,
};
-const double pylith::feassemble::QuadratureData3DLinear::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData3DLinear::_jacobianInv[] = {
6.04089219e-01, -3.40768278e-01, 3.09789343e-03,
-1.14312268e+00, 1.92688971e+00, -1.08426270e-01,
6.13382900e-01, -1.11524164e+00, 4.64684015e-01,
@@ -136,15 +90,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData3DLinear::~QuadratureData3DLinear(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DLinear.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata3dlinear_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -62,183 +62,7 @@
3.45833333e-01, 1.06944444e-01, 1.33750000e+00,
};
-const double pylith::feassemble::QuadratureData3DQuadratic::_basisVert[] = {
- 1.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, 1.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 1.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00,};
-
-const double pylith::feassemble::QuadratureData3DQuadratic::_basisDerivVert[] = {
- -3.00000000e+00, -3.00000000e+00, -3.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -1.00000000e+00,
- 4.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 4.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 4.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
- 3.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -1.00000000e+00,
- -4.00000000e+00, -4.00000000e+00, -4.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 4.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 4.00000000e+00,
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 3.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -1.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -4.00000000e+00, -4.00000000e+00, -4.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 0.00000000e+00,
- 4.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 4.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 3.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- -4.00000000e+00, -4.00000000e+00, -4.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 4.00000000e+00, 0.00000000e+00,
- 4.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -1.00000000e+00,
- 0.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- -0.00000000e+00, 2.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 2.00000000e+00,
- 0.00000000e+00, 2.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 2.00000000e+00,
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -1.00000000e+00,
- 2.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -2.00000000e+00, 0.00000000e+00, -2.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 2.00000000e+00,
- 2.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 2.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- -1.00000000e+00, -1.00000000e+00, -1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- 2.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -0.00000000e+00, 2.00000000e+00, -0.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 2.00000000e+00, 0.00000000e+00,
- 2.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, -1.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- -0.00000000e+00, -0.00000000e+00, 0.00000000e+00,
- 2.00000000e+00, 2.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 2.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 2.00000000e+00,
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
- -1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- 0.00000000e+00, -0.00000000e+00, -0.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- 2.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 2.00000000e+00, 2.00000000e+00,
- 2.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 1.00000000e+00, 1.00000000e+00, 1.00000000e+00,
- 1.00000000e+00, 0.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, -1.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 0.00000000e+00, 1.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- -0.00000000e+00, 0.00000000e+00, -0.00000000e+00,
- -2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
- 0.00000000e+00, 2.00000000e+00, 0.00000000e+00,
- 0.00000000e+00, 2.00000000e+00, 0.00000000e+00,
- 2.00000000e+00, 0.00000000e+00, 2.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianVert[] = {
- 2.30000000e+00, -4.00000000e-01, 3.00000000e-01,
- 1.70000000e+00, 3.00000000e+00, 1.00000000e+00,
- 5.00000000e-01, 2.30000000e+00, 3.00000000e+00,
- 2.70000000e+00, 4.00000000e-01, 7.00000000e-01,
- 1.70000000e+00, 3.00000000e+00, 1.40000000e+00,
- 9.00000000e-01, 2.70000000e+00, 3.00000000e+00,
- 2.30000000e+00, -4.00000000e-01, 7.00000000e-01,
- 1.30000000e+00, 3.00000000e+00, 1.00000000e+00,
- 5.00000000e-01, 2.70000000e+00, 2.60000000e+00,
- 2.70000000e+00, 0.00000000e+00, 3.00000000e-01,
- 1.70000000e+00, 3.40000000e+00, 6.00000000e-01,
- 9.00000000e-01, 2.70000000e+00, 3.00000000e+00,
- 2.50000000e+00, 0.00000000e+00, 5.00000000e-01,
- 1.70000000e+00, 3.00000000e+00, 1.20000000e+00,
- 7.00000000e-01, 2.50000000e+00, 3.00000000e+00,
- 2.30000000e+00, -4.00000000e-01, 5.00000000e-01,
- 1.50000000e+00, 3.00000000e+00, 1.00000000e+00,
- 5.00000000e-01, 2.50000000e+00, 2.80000000e+00,
- 2.50000000e+00, -2.00000000e-01, 3.00000000e-01,
- 1.70000000e+00, 3.20000000e+00, 8.00000000e-01,
- 7.00000000e-01, 2.50000000e+00, 3.00000000e+00,
- 2.50000000e+00, 2.22044605e-16, 7.00000000e-01,
- 1.50000000e+00, 3.00000000e+00, 1.20000000e+00,
- 7.00000000e-01, 2.70000000e+00, 2.80000000e+00,
- 2.50000000e+00, -2.00000000e-01, 5.00000000e-01,
- 1.50000000e+00, 3.20000000e+00, 8.00000000e-01,
- 7.00000000e-01, 2.70000000e+00, 2.80000000e+00,
- 2.70000000e+00, 2.00000000e-01, 5.00000000e-01,
- 1.70000000e+00, 3.20000000e+00, 1.00000000e+00,
- 9.00000000e-01, 2.70000000e+00, 3.00000000e+00,
-};
-
-const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianDetVert[] = {
- 1.79730000e+01, 1.38810000e+01, 1.42890000e+01, 2.36250000e+01, 1.60750000e+01, 1.61750000e+01, 2.05110000e+01, 1.42650000e+01, 1.86330000e+01, 1.86450000e+01,
-};
-
-const double pylith::feassemble::QuadratureData3DQuadratic::_basisQuad[] = {
+const double pylith::feassemble::QuadratureData3DQuadratic::_basis[] = {
3.75000000e-01, -6.94444444e-02, -6.94444444e-02,
-6.94444444e-02, 2.50000000e-01, 2.50000000e-01,
2.50000000e-01, 2.77777778e-02, 2.77777778e-02,
@@ -254,7 +78,7 @@
2.50000000e-01, 2.77777778e-02, 2.50000000e-01,
2.50000000e-01,};
-const double pylith::feassemble::QuadratureData3DQuadratic::_basisDerivQuad[] = {
+const double pylith::feassemble::QuadratureData3DQuadratic::_basisDeriv[] = {
-2.00000000e+00, -2.00000000e+00, -2.00000000e+00,
-6.66666667e-01, 0.00000000e+00, 0.00000000e+00,
0.00000000e+00, -6.66666667e-01, 0.00000000e+00,
@@ -297,7 +121,7 @@
3.00000000e+00, 0.00000000e+00, 3.33333333e-01,
};
-const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianQuad[] = {
+const double pylith::feassemble::QuadratureData3DQuadratic::_jacobian[] = {
2.36666667e+00, -3.00000000e-01, 3.66666667e-01,
1.66666667e+00, 3.03333333e+00, 1.00000000e+00,
5.66666667e-01, 2.40000000e+00, 2.96666667e+00,
@@ -312,11 +136,11 @@
8.33333333e-01, 2.66666667e+00, 2.96666667e+00,
};
-const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianDetQuad[] = {
+const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianDet[] = {
1.77671111e+01, 1.51087407e+01, 1.53117037e+01, 2.13964444e+01,
};
-const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianInvQuad[] = {
+const double pylith::feassemble::QuadratureData3DQuadratic::_jacobianInv[] = {
3.71410346e-01, 9.96222734e-02, -7.94851911e-02,
-2.46397839e-01, 3.83480088e-01, -9.88092856e-02,
1.28389534e-01, -3.29260056e-01, 4.32196818e-01,
@@ -344,15 +168,11 @@
quadPtsRef = const_cast<double*>(_quadPtsRef);
quadWts = const_cast<double*>(_quadWts);
quadPts = const_cast<double*>(_quadPts);
- basisVert = const_cast<double*>(_basisVert);
- basisDerivVert = const_cast<double*>(_basisDerivVert);
- jacobianVert = const_cast<double*>(_jacobianVert);
- jacobianDetVert = const_cast<double*>(_jacobianDetVert);
- basisQuad = const_cast<double*>(_basisQuad);
- basisDerivQuad = const_cast<double*>(_basisDerivQuad);
- jacobianQuad = const_cast<double*>(_jacobianQuad);
- jacobianDetQuad = const_cast<double*>(_jacobianDetQuad);
- jacobianInvQuad = const_cast<double*>(_jacobianInvQuad);
+ basis = const_cast<double*>(_basis);
+ basisDeriv = const_cast<double*>(_basisDeriv);
+ jacobian = const_cast<double*>(_jacobian);
+ jacobianDet = const_cast<double*>(_jacobianDet);
+ jacobianInv = const_cast<double*>(_jacobianInv);
} // constructor
pylith::feassemble::QuadratureData3DQuadratic::~QuadratureData3DQuadratic(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/QuadratureData3DQuadratic.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,24 +59,16 @@
static const double _quadPts[];
- static const double _basisVert[];
+ static const double _basis[];
- static const double _basisDerivVert[];
+ static const double _basisDeriv[];
- static const double _jacobianVert[];
+ static const double _jacobian[];
- static const double _jacobianDetVert[];
+ static const double _jacobianDet[];
- static const double _basisQuad[];
+ static const double _jacobianInv[];
- static const double _basisDerivQuad[];
-
- static const double _jacobianQuad[];
-
- static const double _jacobianDetQuad[];
-
- static const double _jacobianInvQuad[];
-
};
#endif // pylith_feassemble_quadraturedata3dquadratic_hh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/data/feutils.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/data/feutils.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/data/feutils.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -18,36 +18,8 @@
import numpy
# ----------------------------------------------------------------------
-def calculateJacobianVert(quadrature, vertices):
+def calculateJacobian(quadrature, vertices):
"""
- Calculate jacobian and its determinant at vertices.
-
- @param quadrature Quadrature information
- @param vertices Coordinates of cell's vertices
- """
- jacobian = numpy.zeros( (quadrature.numBasis,
- quadrature.cellDim, quadrature.spaceDim),
- dtype=numpy.float64)
- jacobianDet = numpy.zeros( (quadrature.numBasis,), dtype=numpy.float64)
-
- for iVertex in xrange(quadrature.numBasis):
- # Jacobian
- deriv = quadrature.basisDerivVert[iVertex]
- j = numpy.dot(deriv.transpose(), vertices)
- jacobian[iVertex] = j
-
- # Determinant of Jacobian
- if quadrature.spaceDim == quadrature.cellDim:
- jacobianDet[iVertex] = numpy.linalg.det(j)
- else:
- det = numpy.linalg.det(numpy.dot(j, j.transpose()))**0.5
- jacobianDet[iVertex] = det
- return (jacobian, jacobianDet)
-
-
-# ----------------------------------------------------------------------
-def calculateJacobianQuad(quadrature, vertices):
- """
Calculate jacobian, its determinant, and its inverse at quadrature
points for a given cell.
@@ -65,7 +37,7 @@
iQuad = 0
for q in quadrature.quadPtsRef:
# Jacobian at quadrature points
- deriv = quadrature.basisDerivQuad[iQuad]
+ deriv = quadrature.basisDeriv[iQuad]
j = numpy.dot(deriv.transpose(), vertices)
jacobian[iQuad] = j
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -127,18 +127,11 @@
const int numCorners = 3;
const int numQuadPts = 2;
const int spaceDim = 1;
- const double basisVert[] = { 0.455, 0.667, -0.122,
- -0.122, 0.667, 0.455,
- -0.145, 0.6345, 0.653};
- const double basisDerivVert[] = { -1.077, 1.155, -0.077,
- 0.077, -1.155, 1.077,
- 0.074, -1.355, 2.077};
- const double basisQuad[] = { 0.455, 0.667, -0.122, -0.122, 0.667, 0.455 };
- const double basisDerivQuad[] = { -1.077, 1.155, -0.077, 0.077, -1.155, 1.077 };
+ const double basis[] = { 0.455, 0.667, -0.122, -0.122, 0.667, 0.455 };
+ const double basisDeriv[] = { -1.077, 1.155, -0.077, 0.077, -1.155, 1.077 };
const double quadPtsRef[] = { -0.577350269, 0.577350269 };
const double quadWts[] = { 1.0, 1.0 };
- quadrature.initialize(basisVert, basisDerivVert, basisQuad, basisDerivQuad,
- quadPtsRef, quadWts,
+ quadrature.initialize(basis, basisDeriv, quadPtsRef, quadWts,
cellDim, numCorners, numQuadPts, spaceDim);
spatialdata::spatialdb::SimpleDB db;
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestFIATSimplex.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestFIATSimplex.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestFIATSimplex.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -85,28 +85,16 @@
dtype=numpy.float64 )
quadWtsE = numpy.array( [1.0, 1.0], dtype=numpy.float64 )
- # Compute basis fns and derivatives at vertices
- basisVert = numpy.zeros( (3, 3), dtype=numpy.float64)
- basisDerivVert = numpy.zeros( (3, 3, 1), dtype=numpy.float64)
- iVertex = 0
- for v in verticesRef():
- basisVert[iVertex] = numpy.array([N0(v), N1(v), N2(v)],
- dtype=numpy.float64).reshape( (3,) )
- deriv = numpy.array([[N0p(v)], [N1p(v)], [N2p(v)]],
- dtype=numpy.float64)
- basisDerivVert[iVertex] = deriv.reshape((3, 1))
- iVertex += 1
-
# Compute basis fns and derivatives at quadrature points
- basisQuad = numpy.zeros( (2, 3), dtype=numpy.float64)
- basisDerivQuad = numpy.zeros( (2, 3, 1), dtype=numpy.float64)
+ basis = numpy.zeros( (2, 3), dtype=numpy.float64)
+ basisDeriv = numpy.zeros( (2, 3, 1), dtype=numpy.float64)
iQuad = 0
for q in quadPtsE:
- basisQuad[iQuad] = numpy.array([N0(q), N1(q), N2(q)],
+ basis[iQuad] = numpy.array([N0(q), N1(q), N2(q)],
dtype=numpy.float64).reshape( (3,) )
deriv = numpy.array([[N0p(q)], [N1p(q)], [N2p(q)]],
dtype=numpy.float64)
- basisDerivQuad[iQuad] = deriv.reshape((3, 1))
+ basisDeriv[iQuad] = deriv.reshape((3, 1))
iQuad += 1
cell.initialize()
@@ -119,10 +107,8 @@
# Check arrays
test_double(self, quadPtsE, cell.quadPts)
test_double(self, quadWtsE, cell.quadWts)
- test_double(self, basisVert, cell.basisVert)
- test_double(self, basisDerivVert, cell.basisDerivVert)
- test_double(self, basisQuad, cell.basisQuad)
- test_double(self, basisDerivQuad, cell.basisDerivQuad)
+ test_double(self, basis, cell.basis)
+ test_double(self, basisDeriv, cell.basisDeriv)
return
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.hh 2007-05-11 23:07:43 UTC (rev 6857)
@@ -61,29 +61,17 @@
*/
static int spaceDim(const Quadrature& q);
- /** Get basis functions evaluated at vertices.
- *
- * @returns Array of basis functions evaluated at vertices
- */
- static const double* basisVert(const Quadrature& q);
-
- /** Get derivatives of basis functions evaluated at vertices.
- *
- * @returns Array of derivatives of basis fns evaluated at vertices
- */
- static const double* basisDerivVert(const Quadrature& q);
-
/** Get basis functions evaluated at quadrature points.
*
* @returns Array of basis functions evaluated at quadrature points
*/
- static const double* basisQuad(const Quadrature& q);
+ static const double* basis(const Quadrature& q);
/** Get derivatives of basis functions evaluated at quadrature points.
*
* @returns Array of derivatives of basis fns evaluated at quad pts
*/
- static const double* basisDerivQuad(const Quadrature& q);
+ static const double* basisDeriv(const Quadrature& q);
/** Get coordinates of quadrature points in reference cell.
*
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.icc 2007-05-11 23:07:43 UTC (rev 6857)
@@ -42,32 +42,18 @@
return q._spaceDim;
}
-// Get basis functions evaluated at vertices.
-inline
-const double*
-pylith::feassemble::TestQuadrature::basisVert(const Quadrature& q) {
- return &q._basisVert[0];
-}
-
-// Get derivatives of basis functions evaluated at vertices.
-inline
-const double*
-pylith::feassemble::TestQuadrature::basisDerivVert(const Quadrature& q) {
- return &q._basisDerivVert[0];
-}
-
// Get basis functions evaluated at quadrature points.
inline
const double*
-pylith::feassemble::TestQuadrature::basisQuad(const Quadrature& q) {
- return &q._basisQuad[0];
+pylith::feassemble::TestQuadrature::basis(const Quadrature& q) {
+ return &q._basis[0];
}
// Get derivatives of basis functions evaluated at quadrature points.
inline
const double*
-pylith::feassemble::TestQuadrature::basisDerivQuad(const Quadrature& q) {
- return &q._basisDerivQuad[0];
+pylith::feassemble::TestQuadrature::basisDeriv(const Quadrature& q) {
+ return &q._basisDeriv[0];
}
// Get coordinates of quadrature points
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.py
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.py 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/TestQuadrature.py 2007-05-11 23:07:43 UTC (rev 6857)
@@ -44,9 +44,6 @@
def N2p(p):
return -2.0*p
-def verticesRef():
- return [-1.0, 1.0, 0.0]
-
# ----------------------------------------------------------------------
class TestQuadrature(unittest.TestCase):
"""
@@ -78,28 +75,16 @@
dtype=numpy.float64 )
quadWtsE = numpy.array( [1.0, 1.0], dtype=numpy.float64 )
- # Compute basis functions and derivatives at vertices
- basisVertE = numpy.zeros( (3, 3), dtype=numpy.float64)
- basisDerivVertE = numpy.zeros( (3, 3, 1), dtype=numpy.float64)
- iVertex = 0
- for v in verticesRef():
- basisVertE[iVertex] = numpy.array([N0(v), N1(v), N2(v)],
- dtype=numpy.float64).reshape( (3,) )
- deriv = numpy.array([[N0p(v)], [N1p(v)], [N2p(v)]],
- dtype=numpy.float64)
- basisDerivVertE[iVertex] = deriv.reshape((3, 1))
- iVertex += 1
-
# Compute basis functions and derivatives at quadrature points
- basisQuadE = numpy.zeros( (2, 3), dtype=numpy.float64)
- basisDerivQuadE = numpy.zeros( (2, 3, 1), dtype=numpy.float64)
+ basisE = numpy.zeros( (2, 3), dtype=numpy.float64)
+ basisDerivE = numpy.zeros( (2, 3, 1), dtype=numpy.float64)
iQuad = 0
for q in quadPtsE:
- basisQuadE[iQuad] = numpy.array([N0(q), N1(q), N2(q)],
- dtype=numpy.float64).reshape( (3,) )
+ basisE[iQuad] = numpy.array([N0(q), N1(q), N2(q)],
+ dtype=numpy.float64).reshape( (3,) )
deriv = numpy.array([[N0p(q)], [N1p(q)], [N2p(q)]],
dtype=numpy.float64)
- basisDerivQuadE[iQuad] = deriv.reshape((3, 1))
+ basisDerivE[iQuad] = deriv.reshape((3, 1))
iQuad += 1
quadrature = Quadrature1D()
@@ -110,18 +95,12 @@
from pylith.utils.testarray import test_double
import pylith.feassemble.testfeassemble as testmodule
- basisVert = testmodule.basisVert(quadrature.cppHandle)
- test_double(self, basisVertE, basisVert)
+ basis = testmodule.basis(quadrature.cppHandle)
+ test_double(self, basisE, basis)
- basisDerivVert = testmodule.basisDerivVert(quadrature.cppHandle)
- test_double(self, basisDerivVertE, basisDerivVert)
+ basisDeriv = testmodule.basisDeriv(quadrature.cppHandle)
+ test_double(self, basisDerivE, basisDeriv)
- basisQuad = testmodule.basisQuad(quadrature.cppHandle)
- test_double(self, basisQuadE, basisQuad)
-
- basisDerivQuad = testmodule.basisDerivQuad(quadrature.cppHandle)
- test_double(self, basisDerivQuadE, basisDerivQuad)
-
quadWts = testmodule.quadWts(quadrature.cppHandle)
test_double(self, quadWtsE, quadWts)
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src 2007-05-11 21:39:13 UTC (rev 6856)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/testfeassemble.pyxe.src 2007-05-11 23:07:43 UTC (rev 6857)
@@ -59,27 +59,27 @@
return pylith::feassemble::TestQuadrature::spaceDim(*q);
#}embed
-# create shim for TestQuadrature::basisQuad
-#embed{ double* TestQuadrature_basisQuad(void* obj)
+# create shim for TestQuadrature::basis
+#embed{ double* TestQuadrature_basis(void* obj)
const pylith::feassemble::Quadrature* q =
(pylith::feassemble::Quadrature*) obj;
const int size = TestQuadrature_numQuadPts(obj) *
TestQuadrature_numBasis(obj);
double* vals = (size > 0) ? new double[size] : 0;
-const double* basis = pylith::feassemble::TestQuadrature::basisQuad(*q);
+const double* basis = pylith::feassemble::TestQuadrature::basis(*q);
memcpy(vals, basis, size*sizeof(double));
return vals;
#}embed
-# create shim for TestQuadrature::basisDerivQuad
-#embed{ double* TestQuadrature_basisDerivQuad(void* obj)
+# create shim for TestQuadrature::basisDeriv
+#embed{ double* TestQuadrature_basisDeriv(void* obj)
const pylith::feassemble::Quadrature* q =
(pylith::feassemble::Quadrature*) obj;
const int size = TestQuadrature_numQuadPts(obj) *
TestQuadrature_numBasis(obj) *
TestQuadrature_cellDim(obj);
double* vals = (size > 0) ? new double[size] : 0;
-const double* basisDeriv = pylith::feassemble::TestQuadrature::basisDerivQuad(*q);
+const double* basisDeriv = pylith::feassemble::TestQuadrature::basisDeriv(*q);
memcpy(vals, basisDeriv, size*sizeof(double));
return vals;
#}embed
@@ -108,9 +108,9 @@
#}embed
# ----------------------------------------------------------------------
-def basisQuad(qhandle):
+def basis(qhandle):
"""
- Call TestQuadrature::basisQuad().
+ Call TestQuadrature::basis().
"""
if not qhandle.name == "pylith_feassemble_Quadrature":
raise TypeError, \
@@ -125,16 +125,16 @@
numBasis = TestQuadrature_numBasis(qptr)
cdef double* values
- values = TestQuadrature_basisQuad(qptr)
+ values = TestQuadrature_basis(qptr)
dims = [numQuadPts, numBasis]
valuesObj = PyCObject_FromVoidPtr(values, NULL)
return spatialdata.utils.simplearray.SimpleCppArray(valuesObj, dims, "double")
# ----------------------------------------------------------------------
-def basisDerivQuad(qhandle):
+def basisDeriv(qhandle):
"""
- Call TestQuadrature::basisDerivQuad().
+ Call TestQuadrature::basisDeriv().
"""
if not qhandle.name == "pylith_feassemble_Quadrature":
raise TypeError, \
@@ -151,7 +151,7 @@
cellDim = TestQuadrature_cellDim(qptr)
cdef double* values
- values = TestQuadrature_basisDerivQuad(qptr)
+ values = TestQuadrature_basisDeriv(qptr)
dims = [numQuadPts, numBasis, cellDim]
valuesObj = PyCObject_FromVoidPtr(values, NULL)
return spatialdata.utils.simplearray.SimpleCppArray(valuesObj, dims,
More information about the cig-commits
mailing list