[cig-commits] r14026 - in short/3D/PyLith/branches/pylith-swig: libsrc libsrc/bc libsrc/feassemble unittests/libtests/bc unittests/libtests/feassemble
brad at geodynamics.org
brad at geodynamics.org
Fri Feb 6 08:26:29 PST 2009
Author: brad
Date: 2009-02-06 08:26:28 -0800 (Fri, 06 Feb 2009)
New Revision: 14026
Modified:
short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am
short/3D/PyLith/branches/pylith-swig/libsrc/bc/Makefile.am
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/CellGeometry.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryHex3D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine1D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine2D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine3D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint1D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint2D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint3D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad2D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad3D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTet3D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri2D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri3D.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.hh
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/feassemblefwd.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestCellGeometry.hh
Log:
Updated bc libtests.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/Makefile.am 2009-02-06 16:26:28 UTC (rev 14026)
@@ -25,7 +25,20 @@
bc/BoundaryCondition.cc \
bc/DirichletBC.cc \
bc/DirichletBoundary.cc \
+ feassemble/CellGeometry.cc \
feassemble/Constraint.cc \
+ feassemble/GeometryPoint1D.cc \
+ feassemble/GeometryPoint2D.cc \
+ feassemble/GeometryPoint3D.cc \
+ feassemble/GeometryLine1D.cc \
+ feassemble/GeometryLine2D.cc \
+ feassemble/GeometryLine3D.cc \
+ feassemble/GeometryTri2D.cc \
+ feassemble/GeometryTri3D.cc \
+ feassemble/GeometryTet3D.cc \
+ feassemble/GeometryQuad2D.cc \
+ feassemble/GeometryQuad3D.cc \
+ feassemble/GeometryHex3D.cc \
meshio/BinaryIO.cc \
meshio/GMVFile.cc \
meshio/GMVFileAscii.cc \
@@ -55,21 +68,8 @@
# faults/LiuCosSlipFn.cc \
# faults/SlipTimeFn.cc \
# faults/StepSlipFn.cc \
-# feassemble/CellGeometry.cc \
# feassemble/ElasticityExplicit.cc \
# feassemble/ElasticityImplicit.cc \
-# feassemble/GeometryPoint1D.cc \
-# feassemble/GeometryPoint2D.cc \
-# feassemble/GeometryPoint3D.cc \
-# feassemble/GeometryLine1D.cc \
-# feassemble/GeometryLine2D.cc \
-# feassemble/GeometryLine3D.cc \
-# feassemble/GeometryTri2D.cc \
-# feassemble/GeometryTri3D.cc \
-# feassemble/GeometryTet3D.cc \
-# feassemble/GeometryQuad2D.cc \
-# feassemble/GeometryQuad3D.cc \
-# feassemble/GeometryHex3D.cc \
# feassemble/IntegratorElasticity.cc \
# feassemble/Quadrature.cc \
# feassemble/Quadrature0D.cc \
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/bc/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/bc/Makefile.am 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/bc/Makefile.am 2009-02-06 16:26:28 UTC (rev 14026)
@@ -21,7 +21,8 @@
DirichletBC.icc \
DirichletBoundary.hh \
DirichletBoundary.icc \
- Neumann.hh
+ Neumann.hh \
+ bcfwd.hh
noinst_HEADERS =
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/CellGeometry.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/CellGeometry.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/CellGeometry.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -19,16 +19,12 @@
#if !defined(pylith_feassemble_cellgeometry_hh)
#define pylith_feassemble_cellgeometry_hh
+// Include directives ---------------------------------------------------
+#include "feassemblefwd.hh" // forwward declarations
+
#include "pylith/utils/array.hh" // HASA double_array
-namespace pylith {
- namespace feassemble {
- class CellGeometry;
-
- class TestCellGeometry; // unit testing
- } // feassemble
-} // pylith
-
+// CellGeometry ---------------------------------------------------------
class pylith::feassemble::CellGeometry
{ // CellGeometry
friend class TestCellGeometry; // unit testing
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryHex3D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryHex3D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryHex3D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -32,14 +32,10 @@
#if !defined(pylith_feassemble_geometryhex3d_hh)
#define pylith_feassemble_geometryhex3d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryHex3D;
- } // feassemble
-} // pylith
-
+// GeometryHex3D --------------------------------------------------------
class pylith::feassemble::GeometryHex3D : public CellGeometry
{ // GeometryHex3D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine1D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine1D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine1D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -20,14 +20,10 @@
#if !defined(pylith_feassemble_geometryline1d_hh)
#define pylith_feassemble_geometryline1d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryLine1D;
- } // feassemble
-} // pylith
-
+// GeometryLine1D -------------------------------------------------------
class pylith::feassemble::GeometryLine1D : public CellGeometry
{ // GeometryLine1D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine2D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine2D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine2D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -20,14 +20,10 @@
#if !defined(pylith_feassemble_geometryline2d_hh)
#define pylith_feassemble_geometryline2d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryLine2D;
- } // feassemble
-} // pylith
-
+// GeometryLine2D -------------------------------------------------------
class pylith::feassemble::GeometryLine2D : public CellGeometry
{ // GeometryLine2D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine3D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine3D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryLine3D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -20,14 +20,10 @@
#if !defined(pylith_feassemble_geometryline3d_hh)
#define pylith_feassemble_geometryline3d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryLine3D;
- } // feassemble
-} // pylith
-
+// GeometryLine3D -------------------------------------------------------
class pylith::feassemble::GeometryLine3D : public CellGeometry
{ // GeometryLine3D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint1D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint1D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint1D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -20,14 +20,10 @@
#if !defined(pylith_feassemble_geometrypoint1d_hh)
#define pylith_feassemble_geometrypoint1d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryPoint1D;
- } // feassemble
-} // pylith
-
+// GeometryPoint1D ------------------------------------------------------
class pylith::feassemble::GeometryPoint1D : public CellGeometry
{ // GeometryPoint1D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint2D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint2D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint2D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -20,14 +20,10 @@
#if !defined(pylith_feassemble_geometrypoint2d_hh)
#define pylith_feassemble_geometrypoint2d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryPoint2D;
- } // feassemble
-} // pylith
-
+// GeometryPoint2D ------------------------------------------------------
class pylith::feassemble::GeometryPoint2D : public CellGeometry
{ // GeometryPoint2D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint3D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint3D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryPoint3D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -20,14 +20,10 @@
#if !defined(pylith_feassemble_geometrypoint3d_hh)
#define pylith_feassemble_geometrypoint3d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryPoint3D;
- } // feassemble
-} // pylith
-
+// GeometryPoint3D ------------------------------------------------------
class pylith::feassemble::GeometryPoint3D : public CellGeometry
{ // GeometryPoint3D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad2D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad2D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad2D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -33,14 +33,10 @@
#if !defined(pylith_feassemble_geometryquad2d_hh)
#define pylith_feassemble_geometryquad2d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryQuad2D;
- } // feassemble
-} // pylith
-
+// GeometryQuad2D -------------------------------------------------------
class pylith::feassemble::GeometryQuad2D : public CellGeometry
{ // GeometryQuad2D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad3D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad3D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryQuad3D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -33,14 +33,10 @@
#if !defined(pylith_feassemble_geometryquad3d_hh)
#define pylith_feassemble_geometryquad3d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryQuad3D;
- } // feassemble
-} // pylith
-
+// GeometryQuad3D -------------------------------------------------------
class pylith::feassemble::GeometryQuad3D : public CellGeometry
{ // GeometryQuad3D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTet3D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTet3D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTet3D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -28,14 +28,10 @@
#if !defined(pylith_feassemble_geometrytet3d_hh)
#define pylith_feassemble_geometrytet3d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryTet3D;
- } // feassemble
-} // pylith
-
+// GeometryTet3D --------------------------------------------------------
class pylith::feassemble::GeometryTet3D : public CellGeometry
{ // GeometryTet3D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri2D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri2D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri2D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -27,14 +27,10 @@
#if !defined(pylith_feassemble_geometrytri2d_hh)
#define pylith_feassemble_geometrytri2d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryTri2D;
- } // feassemble
-} // pylith
-
+// GeometryTri2D --------------------------------------------------------
class pylith::feassemble::GeometryTri2D : public CellGeometry
{ // GeometryTri2D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri3D.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri3D.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/GeometryTri3D.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -27,14 +27,10 @@
#if !defined(pylith_feassemble_geometrytri3d_hh)
#define pylith_feassemble_geometrytri3d_hh
+// Include directives ---------------------------------------------------
#include "CellGeometry.hh" // ISA CellGeometry
-namespace pylith {
- namespace feassemble {
- class GeometryTri3D;
- } // feassemble
-} // pylith
-
+// GeometryTri3D --------------------------------------------------------
class pylith::feassemble::GeometryTri3D : public CellGeometry
{ // GeometryTri3D
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -33,9 +33,6 @@
#include "pylith/utils/array.hh" // HASA double_array
-#define NEWPYLITHMESH 1
-#include "pylith/utils/sievetypes.hh" // USES SieveMesh
-
namespace pylith {
namespace feassemble {
class Quadrature;
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/feassemblefwd.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/feassemblefwd.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/feassemblefwd.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -27,7 +27,7 @@
class CellGeometry;
class GeometryPoint1D;
class GeometryPoint2D;
- class geometryPoint3D;
+ class GeometryPoint3D;
class GeometryLine1D;
class GeometryLine2D;
class GeometryLine3D;
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc 2009-02-06 16:26:28 UTC (rev 14026)
@@ -31,6 +31,10 @@
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::bc::TestDirichletBC );
// ----------------------------------------------------------------------
+typedef pylith::topology::Mesh::SieveMesh SieveMesh;
+typedef pylith::topology::Mesh::RealSection RealSection;
+
+// ----------------------------------------------------------------------
// Setup testing data.
void
pylith::bc::TestDirichletBC::setUp(void)
@@ -126,9 +130,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(mesh);
+ topology::Field<topology::Mesh> field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<MeshRealSection>& fieldSection = field.section();
+ const ALE::Obj<RealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bc.setConstraintSizes(field);
@@ -171,9 +175,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(mesh);
+ topology::Field<topology::Mesh> field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<MeshRealSection>& fieldSection = field.section();
+ const ALE::Obj<RealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bc.setConstraintSizes(field);
@@ -218,9 +222,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(mesh);
+ topology::Field<topology::Mesh> field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<MeshRealSection>& fieldSection = field.section();
+ const ALE::Obj<RealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bc.setConstraintSizes(field);
@@ -235,7 +239,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const MeshRealSection::value_type* values =
+ const RealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
for (int i=0; i < fiberDim; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[i], tolerance);
@@ -266,7 +270,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const MeshRealSection::value_type* values =
+ const RealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
if (*v_iter != _data->constrainedPoints[iConstraint] + offset) {
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -23,18 +23,15 @@
#include <cppunit/extensions/HelperMacros.h>
+#include "pylith/bc/bcfwd.hh" // forward declarations
+#include "pylith/topology/topologyfwd.hh" // forward declarations
+
/// Namespace for pylith package
namespace pylith {
namespace bc {
class TestDirichletBC;
-
- class DirichletBC;
class DirichletData;
} // bc
-
- namespace topology {
- class Mesh;
- } // topology
} // pylith
/// C++ unit testing for DirichletBC.
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc 2009-02-06 16:26:28 UTC (rev 14026)
@@ -29,6 +29,10 @@
#include "spatialdata/spatialdb/UniformDB.hh" // USES UniformDB
// ----------------------------------------------------------------------
+typedef pylith::topology::Mesh::SieveMesh SieveMesh;
+typedef pylith::topology::Mesh::RealSection RealSection;
+
+// ----------------------------------------------------------------------
// Setup testing data.
void
pylith::bc::TestDirichletBCMulti::setUp(void)
@@ -63,9 +67,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(mesh);
+ topology::Field<topology::Mesh> field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<MeshRealSection>& fieldSection = field.section();
+ const ALE::Obj<RealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bcA.setConstraintSizes(field);
@@ -104,9 +108,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(mesh);
+ topology::Field<topology::Mesh> field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<MeshRealSection>& fieldSection = field.section();
+ const ALE::Obj<RealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bcA.setConstraintSizes(field);
@@ -151,9 +155,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(mesh);
+ topology::Field<topology::Mesh> field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<MeshRealSection>& fieldSection = field.section();
+ const ALE::Obj<RealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bcA.setConstraintSizes(field);
@@ -172,7 +176,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const MeshRealSection::value_type* values =
+ const RealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
for (int i=0; i < fiberDim; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[i], tolerance);
@@ -190,7 +194,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const MeshRealSection::value_type* values =
+ const RealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
for (int iDOF=0; iDOF < fiberDim; ++iDOF)
CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->field[i++], values[iDOF], tolerance);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -23,18 +23,15 @@
#include <cppunit/extensions/HelperMacros.h>
+#include "pylith/bc/bcfwd.hh" // forward declarations
+#include "pylith/topology/topologyfwd.hh" // forward declarations
+
/// Namespace for pylith package
namespace pylith {
namespace bc {
class TestDirichletBCMulti;
-
- class DirichletBC;
class DirichletDataMulti;
} // bc
-
- namespace topology {
- class Mesh;
- } // topology
} // pylith
/// C++ unit testing for DirichletBCMulti.
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc 2009-02-06 16:26:28 UTC (rev 14026)
@@ -19,9 +19,7 @@
#include "data/DirichletData.hh" // USES DirichletData
#include "pylith/topology/Mesh.hh" // USES Mesh
-#include "pylith/topology/Field.hh" // USES Field
#include "pylith/topology/SubMesh.hh" // USES SubMesh
-#include "pylith/topology/FieldSubMesh.hh" // USES FieldSubMesh
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
@@ -33,6 +31,9 @@
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::bc::TestDirichletBoundary );
// ----------------------------------------------------------------------
+typedef pylith::topology::SubMesh::SieveMesh SieveMesh;
+
+// ----------------------------------------------------------------------
// Setup testing data.
void
pylith::bc::TestDirichletBoundary::setUp(void)
@@ -72,15 +73,15 @@
const int numFixedDOF = _data->numFixedDOF;
const size_t numBoundary = _data->numConstrainedPts;
// Check vertices in boundary mesh
- const ALE::Obj<SieveSubMesh>& sieveMesh = bc._boundaryMesh->sieveMesh();
- const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
+ const ALE::Obj<SieveMesh>& sieveMesh = bc._boundaryMesh->sieveMesh();
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
sieveMesh->depthStratum(0);
- const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
+ const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
const int offset = numCells;
if (numFixedDOF > 0) {
int i = 0;
- for (SieveSubMesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveMesh::label_sequence::iterator v_iter=vertices->begin();
v_iter != verticesEnd;
++v_iter, ++i) {
CPPUNIT_ASSERT_EQUAL(_data->constrainedPoints[i]+offset, *v_iter);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -23,12 +23,13 @@
#include <cppunit/extensions/HelperMacros.h>
+#include "pylith/bc/bcfwd.hh" // forward declarations
+#include "pylith/topology/topologyfwd.hh" // forward declarations
+
/// Namespace for pylith package
namespace pylith {
namespace bc {
class TestDirichletBoundary;
-
- class DirichletBoundary;
class DirichletData;
} // bc
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/Makefile.am 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/Makefile.am 2009-02-06 16:26:28 UTC (rev 14026)
@@ -22,26 +22,6 @@
# Primary source files
testfeassemble_SOURCES = \
TestCellGeometry.cc \
- TestElasticityExplicit.cc \
- TestElasticityExplicit1DLinear.cc \
- TestElasticityExplicit1DQuadratic.cc \
- TestElasticityExplicit2DLinear.cc \
- TestElasticityExplicit2DQuadratic.cc \
- TestElasticityExplicit3DLinear.cc \
- TestElasticityExplicit3DQuadratic.cc \
- TestElasticityImplicit.cc \
- TestElasticityImplicit1DLinear.cc \
- TestElasticityImplicit1DQuadratic.cc \
- TestElasticityImplicit2DLinear.cc \
- TestElasticityImplicit2DQuadratic.cc \
- TestElasticityImplicit3DLinear.cc \
- TestElasticityImplicit3DQuadratic.cc \
- TestElasticityImplicitGrav1DLinear.cc \
- TestElasticityImplicitGrav1DQuadratic.cc \
- TestElasticityImplicitGrav2DLinear.cc \
- TestElasticityImplicitGrav2DQuadratic.cc \
- TestElasticityImplicitGrav3DLinear.cc \
- TestElasticityImplicitGrav3DQuadratic.cc \
TestGeometryPoint1D.cc \
TestGeometryPoint2D.cc \
TestGeometryPoint3D.cc \
@@ -54,17 +34,39 @@
TestGeometryQuad3D.cc \
TestGeometryTet3D.cc \
TestGeometryHex3D.cc \
- TestIntegrator.cc \
- TestIntegratorElasticity.cc \
- TestQuadrature.cc \
- TestQuadrature0D.cc \
- TestQuadrature1D.cc \
- TestQuadrature1Din2D.cc \
- TestQuadrature2D.cc \
- TestQuadrature2Din3D.cc \
- TestQuadrature3D.cc \
test_feassemble.cc
+# TestIntegrator.cc \
+# TestIntegratorElasticity.cc \
+# TestQuadrature.cc \
+# TestQuadrature0D.cc \
+# TestQuadrature1D.cc \
+# TestQuadrature1Din2D.cc \
+# TestQuadrature2D.cc \
+# TestQuadrature2Din3D.cc \
+# TestQuadrature3D.cc \
+# TestElasticityExplicit.cc \
+# TestElasticityExplicit1DLinear.cc \
+# TestElasticityExplicit1DQuadratic.cc \
+# TestElasticityExplicit2DLinear.cc \
+# TestElasticityExplicit2DQuadratic.cc \
+# TestElasticityExplicit3DLinear.cc \
+# TestElasticityExplicit3DQuadratic.cc \
+# TestElasticityImplicit.cc \
+# TestElasticityImplicit1DLinear.cc \
+# TestElasticityImplicit1DQuadratic.cc \
+# TestElasticityImplicit2DLinear.cc \
+# TestElasticityImplicit2DQuadratic.cc \
+# TestElasticityImplicit3DLinear.cc \
+# TestElasticityImplicit3DQuadratic.cc \
+# TestElasticityImplicitGrav1DLinear.cc \
+# TestElasticityImplicitGrav1DQuadratic.cc \
+# TestElasticityImplicitGrav2DLinear.cc \
+# TestElasticityImplicitGrav2DQuadratic.cc \
+# TestElasticityImplicitGrav3DLinear.cc \
+# TestElasticityImplicitGrav3DQuadratic.cc
+
+
noinst_HEADERS = \
TestCellGeometry.hh \
TestElasticityExplicit.hh \
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestCellGeometry.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestCellGeometry.hh 2009-02-06 05:23:10 UTC (rev 14025)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/feassemble/TestCellGeometry.hh 2009-02-06 16:26:28 UTC (rev 14026)
@@ -23,12 +23,13 @@
#include <cppunit/extensions/HelperMacros.h>
+#include "pylith/feassemble/feassemblefwd.hh" // forward declarations
+
/// Namespace for pylith package
namespace pylith {
namespace feassemble {
class TestCellGeometry;
- class CellGeometry;
class CellGeomData;
} // feassemble
} // pylith
More information about the CIG-COMMITS
mailing list