[cig-commits] r5103 - short/3D/PyLith/trunk/libsrc/feassemble
brad at geodynamics.org
brad at geodynamics.org
Thu Oct 26 16:36:48 PDT 2006
Author: brad
Date: 2006-10-26 16:36:47 -0700 (Thu, 26 Oct 2006)
New Revision: 5103
Modified:
short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
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
Log:
Used typedefs to reduce clutter on Sieve types.
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -43,6 +43,13 @@
{ // Quadrature
friend class TestQuadrature; // unit testing
+// PUBLIC TYPEDEFS //////////////////////////////////////////////////////
+public :
+
+ typedef ALE::Mesh Mesh;
+ typedef Mesh::topology_type topology_type;
+ typedef Mesh::real_section_type real_section_type;
+
// PUBLIC METHODS ///////////////////////////////////////////////////////
public :
@@ -179,8 +186,8 @@
* @param cell Finite-element cell
*/
virtual
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell) = 0;
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell) = 0;
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.cc 2006-10-26 23:36:47 UTC (rev 5103)
@@ -39,8 +39,8 @@
// Compute geometric quantities for a cell.
void
pylith::feassemble::Quadrature1D::computeGeometry(
- const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell)
+ const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell)
{ // computeGeometry
assert(1 == _cellDim);
assert(1 == _spaceDim);
@@ -54,8 +54,8 @@
_resetGeometry();
// Get coordinates of cell's vertices
- const ALE::Mesh::topology_type::patch_type patch = 0;
- const ALE::Mesh::real_section_type::value_type* vertCoords =
+ const topology_type::patch_type patch = 0;
+ const real_section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
//assert(1 == coordinates.GetFiberDimensionByDepth(patch,
//*vertices->begin(), 0));
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1D.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -44,8 +44,8 @@
/// Create a copy of this object.
Quadrature* clone(void) const;
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.cc 2006-10-26 23:36:47 UTC (rev 5103)
@@ -39,8 +39,8 @@
// Compute geometric quantities for a cell.
void
pylith::feassemble::Quadrature1Din2D::computeGeometry(
- const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell)
+ const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell)
{ // computeGeometry
assert(1 == _cellDim);
assert(2 == _spaceDim);
@@ -54,8 +54,8 @@
_resetGeometry();
// Get coordinates of cell's vertices
- const ALE::Mesh::topology_type::patch_type patch = 0;
- const ALE::Mesh::real_section_type::value_type* vertCoords =
+ const topology_type::patch_type patch = 0;
+ const real_section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
//assert(2 == coordinates.GetFiberDimensionByDepth(patch,
//*vertices->begin(), 0));
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din2D.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -49,8 +49,8 @@
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.cc 2006-10-26 23:36:47 UTC (rev 5103)
@@ -39,8 +39,8 @@
// Compute geometric quantities for a cell.
void
pylith::feassemble::Quadrature1Din3D::computeGeometry(
- const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell)
+ const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell)
{ // computeGeometry
assert(1 == _cellDim);
assert(3 == _spaceDim);
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature1Din3D.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -49,8 +49,8 @@
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.cc 2006-10-26 23:36:47 UTC (rev 5103)
@@ -39,8 +39,8 @@
// Compute geometric quantities for a cell.
void
pylith::feassemble::Quadrature2D::computeGeometry(
- const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell)
+ const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell)
{ // computeGeometry
assert(2 == _cellDim);
assert(2 == _spaceDim);
@@ -54,8 +54,8 @@
_resetGeometry();
// Get coordinates of cell's vertices
- const ALE::Mesh::topology_type::patch_type patch = 0;
- const ALE::Mesh::real_section_type::value_type* vertCoords =
+ const topology_type::patch_type patch = 0;
+ const real_section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
//assert(2 == coordinates.GetFiberDimensionByDepth(patch,
//*vertices->begin(), 0));
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2D.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -49,8 +49,8 @@
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.cc 2006-10-26 23:36:47 UTC (rev 5103)
@@ -42,8 +42,8 @@
// Compute geometric quantities for a cell.
void
pylith::feassemble::Quadrature2Din3D::computeGeometry(
- const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell)
+ const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell)
{ // computeGeometry
assert(2 == _cellDim);
assert(3 == _spaceDim);
@@ -57,8 +57,8 @@
_resetGeometry();
// Get coordinates of cell's vertices
- const ALE::Mesh::topology_type::patch_type patch = 0;
- const ALE::Mesh::real_section_type::value_type* vertCoords =
+ const topology_type::patch_type patch = 0;
+ const real_section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
//assert(3 == coordinates.GetFiberDimensionByDepth(patch,
//*vertices->begin(), 0));
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature2Din3D.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -49,8 +49,8 @@
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.cc 2006-10-26 23:36:47 UTC (rev 5103)
@@ -39,8 +39,8 @@
// Compute geometric quantities for a cell.
void
pylith::feassemble::Quadrature3D::computeGeometry(
- const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell)
+ const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell)
{ // computeGeometry
assert(3 == _cellDim);
assert(3 == _spaceDim);
@@ -54,8 +54,8 @@
_resetGeometry();
// Get coordinates of cell's vertices
- const ALE::Mesh::topology_type::patch_type patch = 0;
- const ALE::Mesh::real_section_type::value_type* vertCoords =
+ const topology_type::patch_type patch = 0;
+ const real_section_type::value_type* vertCoords =
coordinates->restrict(patch, cell);
//assert(3 == coordinates.GetFiberDimensionByDepth(patch,
//*vertices->begin(), 0));
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh 2006-10-26 19:53:25 UTC (rev 5102)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Quadrature3D.hh 2006-10-26 23:36:47 UTC (rev 5103)
@@ -49,8 +49,8 @@
* @param coordinates Section containing vertex coordinates
* @param cell Finite-element cell
*/
- void computeGeometry(const ALE::Obj<ALE::Mesh::real_section_type>& coordinates,
- const ALE::Mesh::point_type& cell);
+ void computeGeometry(const ALE::Obj<real_section_type>& coordinates,
+ const topology_type::point_type& cell);
// PROTECTED METHODS ////////////////////////////////////////////////////
protected :
More information about the cig-commits
mailing list