[cig-commits] r17150 - in short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc: . data

brad at geodynamics.org brad at geodynamics.org
Mon Aug 30 13:27:41 PDT 2010


Author: brad
Date: 2010-08-30 13:27:41 -0700 (Mon, 30 Aug 2010)
New Revision: 17150

Modified:
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestNeumann.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/AbsorbingDampersDataHex8.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/BoundaryMeshDataHex8.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.hh
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.hh
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.hh
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.hh
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.hh
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.cc
   short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.hh
Log:
Cleaned up checking of boundary mesh for Neumann. Updated for adjustment of vertex order on hex faces.

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestNeumann.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestNeumann.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/TestNeumann.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -166,52 +166,29 @@
   const int numCorners = _data->numCorners;
   const int spaceDim = _data->spaceDim;
   const ALE::Obj<SieveSubMesh::label_sequence>& cells = submesh->heightStratum(1);
-  const int numBoundaryVertices = submesh->depthStratum(0)->size();
-  const int numBoundaryCells = cells->size();
+  const int numVertices = submesh->depthStratum(0)->size();
+  const int numCells = cells->size();
+  const int boundaryDepth = submesh->depth()-1; // depth of boundary cells
 
   CPPUNIT_ASSERT_EQUAL(_data->cellDim, cellDim);
-  CPPUNIT_ASSERT_EQUAL(_data->numBoundaryVertices, numBoundaryVertices);
-  CPPUNIT_ASSERT_EQUAL(_data->numBoundaryCells, numBoundaryCells);
+  CPPUNIT_ASSERT_EQUAL(_data->numVertices, numVertices);
+  CPPUNIT_ASSERT_EQUAL(_data->numCells, numCells);
 
-  const int boundaryDepth = submesh->depth()-1; // depth of boundary cells
-  const ALE::Obj<SubRealSection>& coordinates =
-    submesh->getRealSection("coordinates");
-  RestrictVisitor coordsVisitor(*coordinates, numCorners*spaceDim);
-  // coordinates->view("Mesh coordinates from TestNeumann::testInitialize");
-
-  const int numBasis = bc._quadrature->numBasis();
-  const int cellVertSize = _data->numCorners * spaceDim;
-  double_array cellVertices(cellVertSize);
-
-  const double tolerance = 1.0e-06;
-
-  // check cell vertices
-  int iCell = 0;
+  const ALE::Obj<SieveMesh::sieve_type>& sieve = submesh->getSieve();
+  ALE::ISieveVisitor::PointRetriever<SieveSubMesh::sieve_type> pV(sieve->getMaxConeSize());
+  int dp = 0;
   for(SieveSubMesh::label_sequence::iterator c_iter = cells->begin();
       c_iter != cells->end();
       ++c_iter) {
     const int numCorners = submesh->getNumCellCorners(*c_iter, boundaryDepth);
     CPPUNIT_ASSERT_EQUAL(_data->numCorners, numCorners);
 
-    coordsVisitor.clear();
-    submesh->restrictClosure(*c_iter, coordsVisitor);
-    double vert =0.0;
-    double vertE =0.0;
-    const double* cellVertices = coordsVisitor.getValues();
-    // std::cout << "c_iter " << *c_iter << " vertex coords:" << std::endl;
-    for(int iVert = 0; iVert < numCorners; ++iVert) {
-      for(int iDim = 0; iDim < spaceDim; ++iDim) {
-	vertE = _data->cellVertices[iDim+spaceDim*iVert+iCell*cellVertSize];
-	vert = cellVertices[iDim+spaceDim*iVert];
-        // std::cout << "  " << cellVertices[iDim+spaceDim*iVert];
-	if (fabs(vertE) > 1.0)
-	  CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vert/vertE, tolerance);
-	else
-	  CPPUNIT_ASSERT_DOUBLES_EQUAL(vert, vertE, tolerance);
-      } // for
-      // std::cout << std::endl;
-    } // for
-    iCell++;
+    sieve->cone(*c_iter, pV);
+    const SieveSubMesh::point_type *cone = pV.getPoints();
+    for(int p = 0; p < pV.getSize(); ++p, ++dp) {
+      CPPUNIT_ASSERT_EQUAL(_data->cells[dp], cone[p]);
+    }
+    pV.clear();
   } // for
 
   // Check traction values
@@ -223,6 +200,7 @@
   const ALE::Obj<SubRealSection>& tractionSection =
     bc._parameters->get("initial").section();
 
+  const double tolerance = 1.0e-06;
   for(SieveSubMesh::label_sequence::iterator c_iter = cells->begin();
       c_iter != cells->end();
       ++c_iter) {

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/AbsorbingDampersDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/AbsorbingDampersDataHex8.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/AbsorbingDampersDataHex8.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -112,8 +112,8 @@
 const int pylith::bc::AbsorbingDampersDataHex8::_numCells = 2;
 const int pylith::bc::AbsorbingDampersDataHex8::_numCorners = 4;
 const int pylith::bc::AbsorbingDampersDataHex8::_cells[] = {
-  4, 10,  8,  2,
-  6, 12, 10,  4,
+  2, 4, 10,  8,
+  4, 6, 12, 10,
 };
 
 

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/BoundaryMeshDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/BoundaryMeshDataHex8.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/BoundaryMeshDataHex8.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -33,8 +33,8 @@
   2, 4, 6, 8, 10, 12
 };
 const int pylith::bc::BoundaryMeshDataHex8::_cellsNoFault[] = {
-  4, 10, 8, 2,
-  6, 12, 10, 4
+  2, 4, 10, 8,
+  4, 6, 12, 10,
 };
 
 const int pylith::bc::BoundaryMeshDataHex8::_numVerticesFault = 8;
@@ -42,8 +42,8 @@
   2, 4, 6, 8, 10, 12, 14, 16
 };
 const int pylith::bc::BoundaryMeshDataHex8::_cellsFault[] = {
-  14, 16, 8, 2,
-  6, 12, 10, 4,
+  2, 14, 16, 8,
+  4, 6, 12, 10,
 };
 
 pylith::bc::BoundaryMeshDataHex8::BoundaryMeshDataHex8(void)

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -33,10 +33,10 @@
   label(""),
   spaceDim(0),
   cellDim(0),
-  numBoundaryVertices(0),
-  numBoundaryCells(0),
+  numVertices(0),
+  numCells(0),
   numCorners(0),
-  cellVertices(0),
+  cells(0),
   tractionsCell(0),
   valsResidual(0)
 { // constructor

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.hh	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannData.hh	2010-08-30 20:27:41 UTC (rev 17150)
@@ -61,12 +61,12 @@
 
   /// @name Boundary mesh information
   //@{
-  int spaceDim; ///< Number of dimensions of vertex coordinates
-  int cellDim; ///< Dimension of surface cells.
-  int numBoundaryVertices; ///< Number of boundary vertices in the mesh.
-  int numBoundaryCells; ///< Number of cells on Neumann boundary.
-  int numCorners; ///< Number of vertices for each boundary cell.
-  double* cellVertices; ///< Vertex coordinates for boundary cells.
+  int spaceDim; ///< Number of dimensions in vertex coordinates
+  int cellDim; ///< Number of dimensions associated with cell
+  int numVertices; ///< Number of vertices
+  int numCells; ///< Number of cells
+  int numCorners; ///< Number of vertices in cell
+  int* cells; ///< Indices of vertices in cells
   //@}
 
   /// @name Calculated values.

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -78,18 +78,14 @@
 
 const int pylith::bc::NeumannDataHex8::_spaceDim = 3;
 const int pylith::bc::NeumannDataHex8::_cellDim = 2;
-
-const int pylith::bc::NeumannDataHex8::_numBoundaryVertices = 6;
-const int pylith::bc::NeumannDataHex8::_numBoundaryCells = 2;
+const int pylith::bc::NeumannDataHex8::_numVertices = 6;
+const int pylith::bc::NeumannDataHex8::_numCells = 2;
 const int pylith::bc::NeumannDataHex8::_numCorners = 4;
-const double pylith::bc::NeumannDataHex8::_cellVertices[] = { 0.0,-1.0,-1.0,
-							      0.0,-1.0, 1.0,
-							     -2.0,-1.0, 1.0,
-							     -2.0,-1.0,-1.0,
-							      2.0,-1.0,-1.0,
-							      2.0,-1.0, 1.0,
-							      0.0,-1.0, 1.0,
-							      0.0,-1.0,-1.0};
+const int pylith::bc::NeumannDataHex8::_cells[] = {
+  4, 2, 6, 8,
+  8, 6, 10, 12,
+};
+
 const double pylith::bc::NeumannDataHex8::_tractionsCell[] = { 4.0, 0.0, 0.0,
 							       4.0, 0.0, 0.0,
 							       4.0, 0.0, 0.0,
@@ -129,11 +125,11 @@
 
   spaceDim = _spaceDim;
   cellDim = _cellDim;
-  numBoundaryVertices = _numBoundaryVertices;
-  numBoundaryCells = _numBoundaryCells;
+  numVertices = _numVertices;
+  numCells = _numCells;
   numCorners = _numCorners;
+  cells = const_cast<int*>(_cells);
 
-  cellVertices = const_cast<double*>(_cellVertices);
   tractionsCell = const_cast<double*>(_tractionsCell);
   valsResidual = const_cast<double*>(_valsResidual);
 

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.hh	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataHex8.hh	2010-08-30 20:27:41 UTC (rev 17150)
@@ -60,10 +60,10 @@
   // Mesh information
   static const int _spaceDim;
   static const int _cellDim;
-  static const int _numBoundaryVertices;
-  static const int _numBoundaryCells;
+  static const int _numVertices;
+  static const int _numCells;
   static const int _numCorners;
-  static const double _cellVertices[];
+  static const int _cells[];
 
   // Calculated values.
   static const double _tractionsCell[];

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -52,11 +52,13 @@
 
 const int pylith::bc::NeumannDataLine2::_spaceDim = 1;
 const int pylith::bc::NeumannDataLine2::_cellDim = 0;
+const int pylith::bc::NeumannDataLine2::_numVertices = 1;
+const int pylith::bc::NeumannDataLine2::_numCells = 1;
+const int pylith::bc::NeumannDataLine2::_numCorners = 1;
+const int pylith::bc::NeumannDataLine2::_cells[] = {
+  2,
+};
 
-const int pylith::bc::NeumannDataLine2::_numBoundaryVertices = 1;
-const int pylith::bc::NeumannDataLine2::_numBoundaryCells = 1;
-const int pylith::bc::NeumannDataLine2::_numCorners = 1;
-const double pylith::bc::NeumannDataLine2::_cellVertices[] = { -1.0};
 const double pylith::bc::NeumannDataLine2::_tractionsCell[] = {
   1.0,
 };
@@ -84,11 +86,11 @@
 
   spaceDim = _spaceDim;
   cellDim = _cellDim;
-  numBoundaryVertices = _numBoundaryVertices;
-  numBoundaryCells = _numBoundaryCells;
+  numVertices = _numVertices;
+  numCells = _numCells;
   numCorners = _numCorners;
+  cells = const_cast<int*>(_cells);
 
-  cellVertices = const_cast<double*>(_cellVertices);
   tractionsCell = const_cast<double*>(_tractionsCell);
   valsResidual = const_cast<double*>(_valsResidual);
 

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.hh	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataLine2.hh	2010-08-30 20:27:41 UTC (rev 17150)
@@ -60,10 +60,10 @@
   // Mesh information
   static const int _spaceDim;
   static const int _cellDim;
-  static const int _numBoundaryVertices;
-  static const int _numBoundaryCells;
+  static const int _numVertices;
+  static const int _numCells;
   static const int _numCorners;
-  static const double _cellVertices[];
+  static const int _cells[];
 
   // Calculated values.
   static const double _tractionsCell[];

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -70,14 +70,14 @@
 
 const int pylith::bc::NeumannDataQuad4::_spaceDim = 2;
 const int pylith::bc::NeumannDataQuad4::_cellDim = 1;
+const int pylith::bc::NeumannDataQuad4::_numVertices = 3;
+const int pylith::bc::NeumannDataQuad4::_numCells = 2;
+const int pylith::bc::NeumannDataQuad4::_numCorners = 2;
+const int pylith::bc::NeumannDataQuad4::_cells[] = {
+  2, 4,
+  4, 6,
+};
 
-const int pylith::bc::NeumannDataQuad4::_numBoundaryVertices = 3;
-const int pylith::bc::NeumannDataQuad4::_numBoundaryCells = 2;
-const int pylith::bc::NeumannDataQuad4::_numCorners = 2;
-const double pylith::bc::NeumannDataQuad4::_cellVertices[] = {-1.0,-1.0,
-							      0.0,-1.0,
-							      0.0,-1.0,
-							      1.0,-1.0};
 const double pylith::bc::NeumannDataQuad4::_tractionsCell[] = {
   0.0, -0.1056624327,
   0.0, -0.3943375673,
@@ -111,11 +111,11 @@
 
   spaceDim = _spaceDim;
   cellDim = _cellDim;
-  numBoundaryVertices = _numBoundaryVertices;
-  numBoundaryCells = _numBoundaryCells;
+  numVertices = _numVertices;
+  numCells = _numCells;
   numCorners = _numCorners;
+  cells = const_cast<int*>(_cells);
 
-  cellVertices = const_cast<double*>(_cellVertices);
   tractionsCell = const_cast<double*>(_tractionsCell);
   valsResidual = const_cast<double*>(_valsResidual);
 

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.hh	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataQuad4.hh	2010-08-30 20:27:41 UTC (rev 17150)
@@ -60,10 +60,10 @@
   // Mesh information
   static const int _spaceDim;
   static const int _cellDim;
-  static const int _numBoundaryVertices;
-  static const int _numBoundaryCells;
+  static const int _numVertices;
+  static const int _numCells;
   static const int _numCorners;
-  static const double _cellVertices[];
+  static const int _cells[];
 
   // Calculated values.
   static const double _tractionsCell[];

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -65,13 +65,13 @@
 
 const int pylith::bc::NeumannDataTet4::_spaceDim = 3;
 const int pylith::bc::NeumannDataTet4::_cellDim = 2;
+const int pylith::bc::NeumannDataTet4::_numVertices = 3;
+const int pylith::bc::NeumannDataTet4::_numCells = 1;
+const int pylith::bc::NeumannDataTet4::_numCorners = 3;
+const int pylith::bc::NeumannDataTet4::_cells[] = {
+  3, 4, 5,
+};
 
-const int pylith::bc::NeumannDataTet4::_numBoundaryVertices = 3;
-const int pylith::bc::NeumannDataTet4::_numBoundaryCells = 1;
-const int pylith::bc::NeumannDataTet4::_numCorners = 3;
-const double pylith::bc::NeumannDataTet4::_cellVertices[] = { 1.0, 0.0, 0.0,
-							      0.0, 1.0, 0.0,
-							      0.0, 0.0, 1.0};
 const double pylith::bc::NeumannDataTet4::_tractionsCell[] = {
   -0.5380048025,  0.87620875991,  1.3938468501
 };
@@ -101,11 +101,11 @@
 
   spaceDim = _spaceDim;
   cellDim = _cellDim;
-  numBoundaryVertices = _numBoundaryVertices;
-  numBoundaryCells = _numBoundaryCells;
+  numVertices = _numVertices;
+  numCells = _numCells;
   numCorners = _numCorners;
+  cells = const_cast<int*>(_cells);
 
-  cellVertices = const_cast<double*>(_cellVertices);
   tractionsCell = const_cast<double*>(_tractionsCell);
   valsResidual = const_cast<double*>(_valsResidual);
 

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.hh	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTet4.hh	2010-08-30 20:27:41 UTC (rev 17150)
@@ -60,10 +60,10 @@
   // Mesh information
   static const int _spaceDim;
   static const int _cellDim;
-  static const int _numBoundaryVertices;
-  static const int _numBoundaryCells;
+  static const int _numVertices;
+  static const int _numCells;
   static const int _numCorners;
-  static const double _cellVertices[];
+  static const int _cells[];
 
   // Calculated values.
   static const double _tractionsCell[];

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.cc	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.cc	2010-08-30 20:27:41 UTC (rev 17150)
@@ -60,12 +60,13 @@
 
 const int pylith::bc::NeumannDataTri3::_spaceDim = 2;
 const int pylith::bc::NeumannDataTri3::_cellDim = 1;
+const int pylith::bc::NeumannDataTri3::_numVertices = 2;
+const int pylith::bc::NeumannDataTri3::_numCells = 1;
+const int pylith::bc::NeumannDataTri3::_numCorners = 2;
+const int pylith::bc::NeumannDataTri3::_cells[] = {
+  3,  5,
+};
 
-const int pylith::bc::NeumannDataTri3::_numBoundaryVertices = 2;
-const int pylith::bc::NeumannDataTri3::_numBoundaryCells = 1;
-const int pylith::bc::NeumannDataTri3::_numCorners = 2;
-const double pylith::bc::NeumannDataTri3::_cellVertices[] = { 0.0,-1.0,
-							      1.0, 0.0};
 const double pylith::bc::NeumannDataTri3::_tractionsCell[] = {
   1.4142135624,  0.0,
 };
@@ -94,11 +95,11 @@
 
   spaceDim = _spaceDim;
   cellDim = _cellDim;
-  numBoundaryVertices = _numBoundaryVertices;
-  numBoundaryCells = _numBoundaryCells;
+  numVertices = _numVertices;
+  numCells = _numCells;
   numCorners = _numCorners;
+  cells = const_cast<int*>(_cells);
 
-  cellVertices = const_cast<double*>(_cellVertices);
   tractionsCell = const_cast<double*>(_tractionsCell);
   valsResidual = const_cast<double*>(_valsResidual);
 

Modified: short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.hh
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.hh	2010-08-30 19:02:23 UTC (rev 17149)
+++ short/3D/PyLith/branches/v1.5-stable/unittests/libtests/bc/data/NeumannDataTri3.hh	2010-08-30 20:27:41 UTC (rev 17150)
@@ -60,10 +60,10 @@
   // Mesh information
   static const int _spaceDim;
   static const int _cellDim;
-  static const int _numBoundaryVertices;
-  static const int _numBoundaryCells;
+  static const int _numVertices;
+  static const int _numCells;
   static const int _numCorners;
-  static const double _cellVertices[];
+  static const int _cells[];
 
   // Calculated values.
   static const double _tractionsCell[];



More information about the CIG-COMMITS mailing list