[cig-commits] [commit] knepley/upgrade-petsc-interface: MeshIO: Updated VTK Mesh tests - Note that data on the hybrid edges is now not tested (89e29fa)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Thu Oct 31 11:02:55 PDT 2013
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/49668423f0d5c65bf25bb9af83a876ba15cadc06...89e29faba55ec6ad39b71ed64e702e732b9fdc2f
>---------------------------------------------------------------
commit 89e29faba55ec6ad39b71ed64e702e732b9fdc2f
Author: Matthew G. Knepley <knepley at gmail.com>
Date: Thu Oct 31 13:05:15 2013 -0500
MeshIO: Updated VTK Mesh tests
- Note that data on the hybrid edges is now not tested
>---------------------------------------------------------------
89e29faba55ec6ad39b71ed64e702e732b9fdc2f
.../meshio/data/DataWriterVTKDataMeshHex8.cc | 36 +++++++++++-----------
.../meshio/data/DataWriterVTKDataMeshTet4.cc | 30 +++++++++---------
.../meshio/data/DataWriterVTKDataMeshTri3.cc | 20 ++++++------
3 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc b/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
index b410087..3aebddb 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
@@ -41,7 +41,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataMeshHex8::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertices = 20;
+const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertices = 16;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFields[4] = {
@@ -50,12 +50,12 @@ pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldScalar[20*1] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldScalar[16*1] = {
2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
10.0, 12.1, 11.1, 13.1, 14.1, 15.1, 16.1, 17.1,
- 18.1, 19.1, 20.1, 21.2
+ //18.1, 19.1, 20.1, 21.2
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldVector[20*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldVector[16*3] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
@@ -72,12 +72,12 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldVector
16.8, 17.9, 18.1,
19.2, 20.3, 21.4,
22.5, 23.6, 24.7,
- 25.8, 26.9, 27.1,
- 28.8, 29.9, 30.1,
- 31.8, 32.9, 33.1,
- 34.8, 35.9, 36.1,
+ //25.8, 26.9, 27.1,
+ //28.8, 29.9, 30.1,
+ //31.8, 32.9, 33.1,
+ //34.8, 35.9, 36.1,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldTensor[20*6] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldTensor[16*6] = {
1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
2.1, 2.2, 2.3, 2.4, 2.5, 2.6,
3.1, 3.2, 3.3, 3.4, 3.5, 3.6,
@@ -94,12 +94,12 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldTensor
14.1, 14.2, 14.3, 14.4, 14.5, 14.6,
15.1, 15.2, 15.3, 15.4, 15.5, 15.6,
16.1, 16.2, 16.3, 16.4, 16.5, 16.6,
- 17.1, 17.2, 17.3, 17.4, 17.5, 17.6,
- 18.1, 18.2, 18.3, 18.4, 18.5, 18.6,
- 19.1, 19.2, 19.3, 19.4, 19.5, 19.6,
- 20.1, 20.2, 20.3, 20.4, 20.5, 20.6,
+ //17.1, 17.2, 17.3, 17.4, 17.5, 17.6,
+ //18.1, 18.2, 18.3, 18.4, 18.5, 18.6,
+ //19.1, 19.2, 19.3, 19.4, 19.5, 19.6,
+ //20.1, 20.2, 20.3, 20.4, 20.5, 20.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldOther[20*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldOther[16*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -116,10 +116,10 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFieldOther[
4.8, 1.5,
2.6, 3.7,
4.8, 5.9,
- 6.1, 7.2,
- 7.1, 8.2,
- 8.1, 9.2,
- 9.1, 10.1
+ //6.1, 7.2,
+ //7.1, 8.2,
+ //8.1, 9.2,
+ //9.1, 10.1
};
const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCells = 3;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc b/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
index fda5431..27a222f 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
@@ -41,7 +41,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataMeshTet4::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertices = 11;
+const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertices = 8;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFields[4] = {
@@ -50,10 +50,10 @@ pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldScalar[11*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8, 10.9, 11.0, 12.1,
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldScalar[8*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8//, 10.9, 11.0, 12.1,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldVector[11*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldVector[8*3] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
@@ -62,11 +62,11 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldVector
16.6, 17.7, 18.8,
19.9, 20.0, 21.1,
22.2, 23.3, 24.4,
- 25.5, 26.6, 27.7,
- 28.8, 29.9, 30.0,
- 31.1, 32.2, 33.3,
+ //25.5, 26.6, 27.7,
+ //28.8, 29.9, 30.0,
+ //31.1, 32.2, 33.3,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldTensor[11*6] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldTensor[8*6] = {
1.1, 1.2, 1.3, 1.4, 1.5, 1.6,
2.1, 2.2, 2.3, 2.4, 2.5, 2.6,
3.1, 3.2, 3.3, 3.4, 3.5, 3.6,
@@ -75,11 +75,11 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldTensor
6.1, 6.2, 6.3, 6.4, 6.5, 6.6,
7.1, 7.2, 7.3, 7.4, 7.5, 7.6,
8.1, 8.2, 8.3, 8.4, 8.5, 8.6,
- 9.1, 9.2, 9.3, 9.4, 9.5, 9.6,
- 10.1, 10.2, 10.3, 10.4, 10.5, 10.6,
- 11.1, 11.2, 11.3, 11.4, 11.5, 11.6,
+ //9.1, 9.2, 9.3, 9.4, 9.5, 9.6,
+ //10.1, 10.2, 10.3, 10.4, 10.5, 10.6,
+ //11.1, 11.2, 11.3, 11.4, 11.5, 11.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldOther[11*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldOther[8*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -88,9 +88,9 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFieldOther[
11.2, 12.3,
13.4, 14.5,
15.6, 16.7,
- 17.8, 18.9,
- 19.0, 20.1,
- 21.2, 22.3,
+ //17.8, 18.9,
+ //19.0, 20.1,
+ //21.2, 22.3,
};
const int pylith::meshio::DataWriterVTKDataMeshTet4::_numCells = 3;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc b/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
index d9fea2b..c4166c6 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
@@ -41,7 +41,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataMeshTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFields[4] = {
@@ -50,36 +50,36 @@ pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldScalar[8*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldScalar[6*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, //8.7, 9.8
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldVector[6*2] = {
1.1, 2.2,
3.3, 4.4,
5.5, 6.6,
7.7, 8.8,
9.9, 10.0,
11.1, 12.2,
- 13.3, 14.4
+ //13.3, 14.4
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldTensor[6*3] = {
1.1, 1.2, 1.3,
2.1, 2.2, 2.3,
3.1, 3.2, 3.3,
4.1, 4.2, 4.3,
5.1, 5.2, 5.3,
6.1, 6.2, 6.3,
- 7.1, 7.2, 7.3,
- 8.1, 8.2, 8.3,
+ //7.1, 7.2, 7.3,
+ //8.1, 8.2, 8.3,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFieldOther[6*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
7.8, 8.9,
9.0, 10.1,
11.2, 12.3,
- 13.4, 14.5
+ //13.4, 14.5
};
const int pylith::meshio::DataWriterVTKDataMeshTri3::_numCells = 3;
More information about the CIG-COMMITS
mailing list