[cig-commits] r17225 - in short/3D/PyLith/trunk/unittests/libtests/topology: . data
brad at geodynamics.org
brad at geodynamics.org
Mon Sep 27 15:25:15 PDT 2010
Author: brad
Date: 2010-09-27 15:25:15 -0700 (Mon, 27 Sep 2010)
New Revision: 17225
Modified:
short/3D/PyLith/trunk/unittests/libtests/topology/TestRefineUniform.cc
short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2.cc
short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2Fault1.cc
short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2.cc
short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2Fault1.cc
Log:
Switched test data to Sieve numbering (easier to check).
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/TestRefineUniform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestRefineUniform.cc 2010-09-27 21:38:01 UTC (rev 17224)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestRefineUniform.cc 2010-09-27 22:25:15 UTC (rev 17225)
@@ -196,7 +196,6 @@
// Normal cells
ALE::ISieveVisitor::PointRetriever<SieveMesh::sieve_type> pV(sieve->getMaxConeSize());
- const int offset = numCells - data.numCellsCohesive;
SieveMesh::label_sequence::iterator c_iter = cells->begin();
for(int iCell=0, i=0; iCell < data.numCells; ++iCell, ++c_iter) {
pV.clear();
@@ -205,7 +204,7 @@
const int coneSize = pV.getSize();
CPPUNIT_ASSERT_EQUAL(data.numCorners, coneSize);
for(int p = 0; p < coneSize; ++p, ++i)
- CPPUNIT_ASSERT_EQUAL(data.cells[i], cone[p]-offset);
+ CPPUNIT_ASSERT_EQUAL(data.cells[i], cone[p]);
} // for
// Cohesive cells
for (int iCell=0, i=0; iCell < data.numCellsCohesive; ++iCell, ++c_iter) {
@@ -215,7 +214,7 @@
const int coneSize = pV.getSize();
CPPUNIT_ASSERT_EQUAL(data.numCornersCohesive, coneSize);
for(int p = 0; p < coneSize; ++p, ++i)
- CPPUNIT_ASSERT_EQUAL(data.cellsCohesive[i], cone[p]-offset);
+ CPPUNIT_ASSERT_EQUAL(data.cellsCohesive[i], cone[p]);
} // for
// check materials
@@ -261,12 +260,11 @@
const int numPoints = groupField->size();
int_array points(numPoints);
int i = 0;
- const int offset = ("vertex" == groupType) ? data.numCells : 0;
for(chart_type::const_iterator c_iter = chart.begin();
c_iter != chart.end();
++c_iter)
if (groupField->getFiberDimension(*c_iter))
- points[i++] = *c_iter - offset;
+ points[i++] = *c_iter;
CPPUNIT_ASSERT_EQUAL(std::string(data.groupNames[iGroup]), *name);
CPPUNIT_ASSERT_EQUAL(std::string(data.groupTypes[iGroup]), groupType);
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2.cc 2010-09-27 21:38:01 UTC (rev 17224)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2.cc 2010-09-27 22:25:15 UTC (rev 17225)
@@ -57,22 +57,22 @@
};
const int pylith::topology::MeshDataCohesiveTet4Level2::_cells[] = {
- 1, 8, 5, 7,
- 5, 6, 7, 8,
- 5, 8, 9, 6,
- 2, 9, 6, 5,
- 7, 10, 8, 6,
- 3, 10, 7, 6,
- 6, 9, 10, 8,
- 0, 8, 10, 9,
- 1, 11, 7, 5,
- 7, 6, 5, 11,
- 7, 11, 12, 6,
- 3, 12, 6, 7,
- 5, 13, 11, 6,
- 2, 13, 5, 6,
- 6, 12, 13, 11,
- 4, 11, 13, 12,
+ 17, 24, 21, 23,
+ 21, 22, 23, 24,
+ 21, 24, 25, 22,
+ 18, 25, 22, 21,
+ 23, 26, 24, 22,
+ 19, 26, 23, 22,
+ 22, 25, 26, 24,
+ 16, 24, 26, 25,
+ 17, 27, 23, 21,
+ 23, 22, 21, 27,
+ 23, 27, 28, 22,
+ 19, 28, 22, 23,
+ 21, 29, 27, 22,
+ 18, 29, 21, 22,
+ 22, 28, 29, 27,
+ 20, 27, 29, 28,
};
const int pylith::topology::MeshDataCohesiveTet4Level2::_cellsCohesive[] = {
};
@@ -88,10 +88,10 @@
};
const int pylith::topology::MeshDataCohesiveTet4Level2::_groups[] = {
- 0, 1, 8,
- 2, 4, 13,
- 0, 4,
- 1, 2, 3, 5, 6, 7,
+ 16, 17, 24,
+ 18, 20, 29,
+ 16, 20,
+ 17, 18, 19, 21, 22, 23,
};
const char* pylith::topology::MeshDataCohesiveTet4Level2::_groupNames[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2Fault1.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2Fault1.cc 2010-09-27 21:38:01 UTC (rev 17224)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTet4Level2Fault1.cc 2010-09-27 22:25:15 UTC (rev 17225)
@@ -70,28 +70,28 @@
};
const int pylith::topology::MeshDataCohesiveTet4Level2Fault1::_cells[] = {
- 1, 11, 8, 10, // original cell 1
- 8, 9, 10, 11,
- 8, 11, 12, 9,
- 2, 12, 9, 8,
- 10, 13, 11, 9,
- 3, 13, 10, 9,
- 9, 12, 13, 11,
- 0, 11, 13, 12,
- 5, 17, 14, 16, // original cell 2
- 14, 15, 16, 17,
- 14, 17, 18, 15,
- 7, 18, 15, 14,
- 16, 19, 17, 15,
- 6, 19, 16, 15,
- 15, 18, 19, 17,
- 4, 17, 19, 18,
+ 17, 27, 24, 26,
+ 24, 25, 26, 27,
+ 24, 27, 28, 25,
+ 18, 28, 25, 24,
+ 26, 29, 27, 25,
+ 19, 29, 26, 25,
+ 25, 28, 29, 27,
+ 16, 27, 29, 28,
+ 21, 33, 30, 32,
+ 30, 31, 32, 33,
+ 30, 33, 34, 31,
+ 23, 34, 31, 30,
+ 32, 35, 33, 31,
+ 22, 35, 32, 31,
+ 31, 34, 35, 33,
+ 20, 33, 35, 34,
};
const int pylith::topology::MeshDataCohesiveTet4Level2Fault1::_cellsCohesive[] = {
- 2, 8, 9, 6, 16, 15, 21, 23, 25,
- 8, 10, 9, 16, 14, 15, 23, 24, 25,
- 1, 10, 8, 5, 14, 16, 20, 24, 23,
- 3, 9, 10, 7, 15, 14, 22, 25, 24,
+ 18, 24, 25, 22, 32, 31, 37, 39, 41,
+ 24, 26, 25, 32, 30, 31, 39, 40, 41,
+ 17, 26, 24, 21, 30, 32, 36, 40, 39,
+ 19, 25, 26, 23, 31, 30, 38, 41, 40,
};
const int pylith::topology::MeshDataCohesiveTet4Level2Fault1::_materialIds[] = {
1, 1, 1, 1, 1, 1, 1, 1,
@@ -106,10 +106,10 @@
};
const int pylith::topology::MeshDataCohesiveTet4Level2Fault1::_groups[] = {
- 0, 1, 5, 11,
- 2, 4, 6, 19,
- 0, 4,
- 1, 2, 3, 5, 6, 7, 8, 9, 10, 14, 15, 16, 20, 21, 22, 23, 24, 25,
+ 16, 17, 21, 27,
+ 18, 20, 22, 35,
+ 16, 20,
+ 17, 18, 19, 21, 22, 23, 24, 25, 26, 30, 31, 32, 36, 37, 38, 39, 40, 41,
};
const char* pylith::topology::MeshDataCohesiveTet4Level2Fault1::_groupNames[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2.cc 2010-09-27 21:38:01 UTC (rev 17224)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2.cc 2010-09-27 22:25:15 UTC (rev 17225)
@@ -56,22 +56,22 @@
};
const int pylith::topology::MeshDataCohesiveTri3Level2::_cells[] = {
- 0, 5, 7,
- 5, 6, 7,
- 1, 6, 5,
- 2, 7, 6,
- 2, 8, 7,
- 8, 9, 7,
- 3, 9, 8,
- 0, 7, 9,
- 2, 6, 11,
- 6, 10, 11,
- 1, 10, 6,
- 4, 11, 10,
- 2, 11, 8,
- 11, 12, 8,
- 4, 12, 11,
- 3, 8, 12,
+ 16, 21, 23,
+ 21, 22, 23,
+ 17, 22, 21,
+ 18, 23, 22,
+ 18, 24, 23,
+ 24, 25, 23,
+ 19, 25, 24,
+ 16, 23, 25,
+ 18, 22, 27,
+ 22, 26, 27,
+ 17, 26, 22,
+ 20, 27, 26,
+ 18, 27, 24,
+ 27, 28, 24,
+ 20, 28, 27,
+ 19, 24, 28,
};
const int pylith::topology::MeshDataCohesiveTri3Level2::_cellsCohesive[] = {
};
@@ -87,10 +87,10 @@
};
const int pylith::topology::MeshDataCohesiveTri3Level2::_groups[] = {
- 0, 1, 3, 5, 9,
- 1, 4, 10,
- 0, 4,
- 1, 2, 3, 6, 8,
+ 16, 17, 19, 21, 25,
+ 17, 20, 26,
+ 16, 20,
+ 17, 18, 19, 22, 24,
};
const char* pylith::topology::MeshDataCohesiveTri3Level2::_groupNames[] = {
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2Fault1.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2Fault1.cc 2010-09-27 21:38:01 UTC (rev 17224)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/data/MeshDataCohesiveTri3Level2Fault1.cc 2010-09-27 22:25:15 UTC (rev 17225)
@@ -67,28 +67,28 @@
};
const int pylith::topology::MeshDataCohesiveTri3Level2Fault1::_cells[] = {
- 0, 8, 10,
- 8, 9, 10,
- 1, 9, 8,
- 2, 10, 9,
- 2, 11, 10,
- 11, 12, 10,
- 3, 12, 11,
- 0, 10, 12,
- 6, 13, 15,
- 13, 14, 15,
- 5, 14, 13,
- 4, 15, 14,
- 6, 15, 17,
- 15, 16, 17,
- 4, 16, 15,
- 7, 17, 16,
+ 16, 24, 26,
+ 24, 25, 26,
+ 17, 25, 24,
+ 18, 26, 25,
+ 18, 27, 26,
+ 27, 28, 26,
+ 19, 28, 27,
+ 16, 26, 28,
+ 22, 29, 31,
+ 29, 30, 31,
+ 21, 30, 29,
+ 20, 31, 30,
+ 22, 31, 33,
+ 31, 32, 33,
+ 20, 32, 31,
+ 23, 33, 32,
};
const int pylith::topology::MeshDataCohesiveTri3Level2Fault1::_cellsCohesive[] = {
- 1, 9, 5, 13, 18, 21,
- 9, 2, 13, 6, 21, 19,
- 2, 11, 6, 17, 19, 22,
- 11, 3, 17, 7, 22, 20,
+ 17, 25, 21, 29, 34, 37,
+ 25, 18, 29, 22, 37, 35,
+ 18, 27, 22, 33, 35, 38,
+ 27, 19, 33, 23, 38, 36,
};
const int pylith::topology::MeshDataCohesiveTri3Level2Fault1::_materialIds[] = {
1, 1, 1, 1, 1, 1, 1, 1,
@@ -103,10 +103,10 @@
};
const int pylith::topology::MeshDataCohesiveTri3Level2Fault1::_groups[] = {
- 0, 1, 3, 5, 7, 8, 12,
- 1, 4, 5, 14,
- 0, 4,
- 1, 2, 3, 5, 6, 7, 9, 11, 13, 17, 18, 19, 20, 21, 22,
+ 16, 17, 19, 21, 23, 24, 28,
+ 17, 20, 21, 30,
+ 16, 20,
+ 17, 18, 19, 21, 22, 23, 25, 27, 29, 33, 34, 35, 36, 37, 38,
};
const char* pylith::topology::MeshDataCohesiveTri3Level2Fault1::_groupNames[] = {
More information about the CIG-COMMITS
mailing list