[cig-commits] [commit] knepley/upgrade-petsc-interface: Update meshio test data for interpolated meshes. (f4fc4fb)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Nov 5 15:54:39 PST 2013
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/d80fbaf3bf5f3a2bcf921fa4fccec1f4f10cb3dd...f4fc4fbe8988e18f1e97a95b95ecae5a8ad9b7e9
>---------------------------------------------------------------
commit f4fc4fbe8988e18f1e97a95b95ecae5a8ad9b7e9
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Tue Nov 5 15:56:54 2013 -0800
Update meshio test data for interpolated meshes.
Also includes some flipping of fault and permutations in topology.
>---------------------------------------------------------------
f4fc4fbe8988e18f1e97a95b95ecae5a8ad9b7e9
.../meshio/data/DataWriterVTKDataMatMeshHex8.cc | 23 ++++------------
.../meshio/data/DataWriterVTKDataMatMeshTet4.cc | 21 ++++----------
.../meshio/data/DataWriterVTKDataMatMeshTri3.cc | 18 ++++--------
.../meshio/data/DataWriterVTKDataPointsHex8.cc | 26 ++++--------------
.../meshio/data/DataWriterVTKDataPointsTet4.cc | 22 ++++-----------
.../meshio/data/DataWriterVTKDataPointsTri3.cc | 18 ++++--------
.../meshio/data/DataWriterVTKDataSubMeshTri3.cc | 18 ++++--------
.../libtests/meshio/data/hex8_bc_cell_t10.vtk | 4 +--
.../libtests/meshio/data/hex8_bc_vertex_t10.vtk | 4 +--
unittests/libtests/meshio/data/hex8_cell_t10.vtk | 4 +--
unittests/libtests/meshio/data/hex8_vertex_t10.vtk | 4 +--
.../libtests/meshio/data/tet4_bc_cell_t10.vtk | 4 +--
.../libtests/meshio/data/tet4_bc_vertex_t10.vtk | 4 +--
.../meshio/data/tet4_points_vertex_t10.vtk | 32 +++++++++++-----------
.../libtests/meshio/data/tet4_surf_cell_t10.vtk | 4 +--
.../libtests/meshio/data/tet4_surf_vertex_t10.vtk | 4 +--
unittests/libtests/meshio/data/tri3.mesh | 8 +++---
.../libtests/meshio/data/tri3_bc_cell_t10.vtk | 4 +--
.../libtests/meshio/data/tri3_bc_vertex_t10.vtk | 4 +--
unittests/libtests/meshio/data/tri3_cell_t10.vtk | 4 +--
.../meshio/data/tri3_points_vertex_t10.vtk | 16 +++++------
.../libtests/meshio/data/tri3_surf_cell_t10.vtk | 4 +--
.../libtests/meshio/data/tri3_surf_vertex_t10.vtk | 12 ++++----
unittests/libtests/meshio/data/tri3_vertex_t10.vtk | 4 +--
24 files changed, 98 insertions(+), 168 deletions(-)
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshHex8.cc b/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshHex8.cc
index a636725..4b9c6cf 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshHex8.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshHex8.cc
@@ -45,7 +45,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataMatMeshHex8::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataMatMeshHex8::_numVertices = 20;
+const int pylith::meshio::DataWriterVTKDataMatMeshHex8::_numVertices = 16;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFields[4] = {
@@ -54,12 +54,11 @@ pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldScalar[20*1] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_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.1
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldVector[20*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldVector[16*3] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
@@ -76,12 +75,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldVec
16.8, 17.9, 18.1,
19.2, 20.3, 21.4,
22.5, 23.6, 24.7,
- 25.5, 26.6, 27.7,
- 28.8, 29.9, 30.0,
- 31.1, 32.2, 33.3,
- 34.4, 35.5, 36.6
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldTensor[20*6] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_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,
@@ -98,12 +93,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldTen
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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldOther[20*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldOther[16*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -120,10 +111,6 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshHex8::_vertexFieldOth
4.8, 1.5,
2.6, 3.7,
4.8, 5.9,
- 1.1, 1.2,
- 2.1, 2.2,
- 3.1, 3.2,
- 4.1, 4.2,
};
const int pylith::meshio::DataWriterVTKDataMatMeshHex8::_numCells = 1;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTet4.cc b/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTet4.cc
index 0fdc816..1c6ba53 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTet4.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTet4.cc
@@ -45,7 +45,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataMatMeshTet4::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataMatMeshTet4::_numVertices = 11;
+const int pylith::meshio::DataWriterVTKDataMatMeshTet4::_numVertices = 8;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFields[4] = {
@@ -54,10 +54,10 @@ pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_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::DataWriterVTKDataMatMeshTet4::_vertexFieldScalar[8*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldVector[11*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldVector[8*3] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
@@ -66,11 +66,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldVec
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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldTensor[11*6] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_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,
@@ -79,11 +76,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldTen
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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldOther[11*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldOther[8*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -92,9 +86,6 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTet4::_vertexFieldOth
11.2, 12.3,
13.4, 14.5,
15.6, 16.7,
- 17.8, 18.9,
- 19.0, 20.1,
- 21.2, 22.3
};
const int pylith::meshio::DataWriterVTKDataMatMeshTet4::_numCells = 2;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTri3.cc b/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTri3.cc
index 95f1da3..17605db 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataMatMeshTri3.cc
@@ -45,7 +45,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataMatMeshTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataMatMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataMatMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFields[4] = {
@@ -54,38 +54,32 @@ pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFieldScalar[8*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFieldScalar[6*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_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,
- 15.5, 16.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFieldTensor[6*3] = {
1.1, 1.2, 1.3,
2.1, 2.2, 3.3,
3.1, 3.2, 4.3,
4.1, 4.2, 5.3,
5.1, 5.2, 6.3,
6.1, 6.2, 7.3,
- 7.1, 7.2, 8.3,
- 8.1, 8.2, 9.3,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataMatMeshTri3::_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,
- 15.6, 16.7
};
const int pylith::meshio::DataWriterVTKDataMatMeshTri3::_numCells = 1;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataPointsHex8.cc b/unittests/libtests/meshio/data/DataWriterVTKDataPointsHex8.cc
index 598d12b..de54350 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataPointsHex8.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataPointsHex8.cc
@@ -38,7 +38,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataPointsHex8::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataPointsHex8::_numVertices = 20;
+const int pylith::meshio::DataWriterVTKDataPointsHex8::_numVertices = 16;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFields[4] = {
@@ -47,7 +47,7 @@ pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldScalar[20*1] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldScalar[16*1] = {
2.1, // 0
3.2, // 1
4.3, // 2
@@ -64,12 +64,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldScal
15.1, // 13
16.1, // 14
17.1, // 15
- 18.1, // 16
- 19.1, // 17
- 20.1, // 18
- 21.2, // 19
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldVector[20*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldVector[16*3] = {
1.1, 2.2, 3.3, // 0
4.4, 5.5, 6.6, // 1
7.7, 8.8, 9.9, // 2
@@ -86,12 +82,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldVect
16.8, 17.9, 18.1, // 13
19.2, 20.3, 21.4, // 14
22.5, 23.6, 24.7, // 15
- 25.8, 26.9, 27.1, // 16
- 28.8, 29.9, 30.1, // 17
- 31.8, 32.9, 33.1, // 18
- 34.8, 35.9, 36.1, // 19
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldTensor[20*6] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_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,
@@ -108,12 +100,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldTens
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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldOther[20*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldOther[16*2] = {
1.2, 2.3, // 0
3.4, 4.5, // 1
5.6, 6.7, // 2
@@ -130,10 +118,6 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsHex8::_vertexFieldOthe
4.8, 1.5, // 13
2.6, 3.7, // 14
4.8, 5.9, // 15
- 6.1, 7.2, // 16
- 7.1, 8.2, // 17
- 8.1, 9.2, // 18
- 9.1, 10.1, // 19
};
const int pylith::meshio::DataWriterVTKDataPointsHex8::_numPoints = 4;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataPointsTet4.cc b/unittests/libtests/meshio/data/DataWriterVTKDataPointsTet4.cc
index 621333f..79cf94c 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataPointsTet4.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataPointsTet4.cc
@@ -38,7 +38,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataPointsTet4::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataPointsTet4::_numVertices = 11;
+const int pylith::meshio::DataWriterVTKDataPointsTet4::_numVertices = 8;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFields[4] = {
@@ -47,7 +47,7 @@ pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldScalar[11*1] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldScalar[8*1] = {
2.1, // 0
3.2, // 1
4.3, // 2
@@ -56,11 +56,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldScal
7.6, // 5
8.7, // 6
9.8, // 7
- 10.9, // 8
- 11.0, // 9
- 12.1, // 10
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldVector[11*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldVector[8*3] = {
1.1, 2.2, 3.3, // 0
4.4, 5.5, 6.6, // 1
7.7, 8.8, 9.9, // 2
@@ -69,11 +66,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldVect
16.6, 17.7, 18.8, // 5
19.9, 20.0, 21.1, // 6
22.2, 23.3, 24.4, // 7
- 25.5, 26.6, 27.7, // 8
- 28.8, 29.9, 30.0, // 9
- 31.1, 32.2, 33.3, // 10
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldTensor[11*6] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_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,
@@ -82,11 +76,8 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldTens
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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldOther[11*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldOther[8*2] = {
1.2, 2.3, // 0
3.4, 4.5, // 1
5.6, 6.7, // 2
@@ -95,9 +86,6 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsTet4::_vertexFieldOthe
11.2, 12.3, // 5
13.4, 14.5, // 6
15.6, 16.7, // 7
- 17.8, 18.9, // 8
- 19.0, 20.1, // 9
- 21.2, 22.3, // 10
};
const int pylith::meshio::DataWriterVTKDataPointsTet4::_numPoints = 4;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataPointsTri3.cc b/unittests/libtests/meshio/data/DataWriterVTKDataPointsTri3.cc
index ffeddd7..447c5ab 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataPointsTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataPointsTri3.cc
@@ -38,7 +38,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataPointsTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataPointsTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataPointsTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFields[4] = {
@@ -47,45 +47,37 @@ pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldScalar[8*1] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldScalar[6*1] = {
2.1, // 0
3.2, // 1
4.3, // 2
5.4, // 3
6.5, // 4
7.6, // 5
- 8.7,
- 9.8
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldVector[6*2] = {
1.1, 2.2, // 0
3.3, 4.4, // 1
5.5, 6.6, // 2
7.7, 8.8, // 3
9.9, 10.0, // 4
11.1, 12.2, // 5
- 13.3, 14.4,
- 15.5, 16.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataPointsTri3::_vertexFieldOther[6*2] = {
1.2, 2.3, // 0
3.4, 4.5, // 1
5.6, 6.7, // 2
7.8, 8.9, // 3
9.0, 10.1, // 4
11.2, 12.3, // 5
- 13.4, 14.5,
- 15.6, 16.7,
};
const int pylith::meshio::DataWriterVTKDataPointsTri3::_numPoints = 3;
diff --git a/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc b/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
index a103ed4..d9588d7 100644
--- a/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
@@ -44,7 +44,7 @@ const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_time = 1.0;
const char* pylith::meshio::DataWriterVTKDataSubMeshTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFields[] = {
@@ -53,38 +53,32 @@ pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFields[] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFieldScalar[8*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
+const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFieldScalar[6*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_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,
- 15.5, 16.6,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_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,
};
-const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_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,
- 15.6, 16.7,
};
const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numCells = 1;
diff --git a/unittests/libtests/meshio/data/hex8_bc_cell_t10.vtk b/unittests/libtests/meshio/data/hex8_bc_cell_t10.vtk
index 7022bcd..c4341b9 100644
--- a/unittests/libtests/meshio/data/hex8_bc_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/hex8_bc_cell_t10.vtk
@@ -12,8 +12,8 @@ POINTS 8 double
0.000000e+00 -1.000000e+00 1.000000e+00
0.000000e+00 1.000000e+00 1.000000e+00
CELLS 2 10
-4 0 6 7 1
-4 2 4 5 3
+4 0 2 3 1
+4 6 4 5 7
CELL_TYPES 2
9
9
diff --git a/unittests/libtests/meshio/data/hex8_bc_vertex_t10.vtk b/unittests/libtests/meshio/data/hex8_bc_vertex_t10.vtk
index 7da5fe7..cbf7872 100644
--- a/unittests/libtests/meshio/data/hex8_bc_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/hex8_bc_vertex_t10.vtk
@@ -12,8 +12,8 @@ POINTS 8 double
0.000000e+00 -1.000000e+00 1.000000e+00
0.000000e+00 1.000000e+00 1.000000e+00
CELLS 2 10
-4 0 6 7 1
-4 2 4 5 3
+4 0 2 3 1
+4 6 4 5 7
CELL_TYPES 2
9
9
diff --git a/unittests/libtests/meshio/data/hex8_cell_t10.vtk b/unittests/libtests/meshio/data/hex8_cell_t10.vtk
index 7925e33..fc15124 100644
--- a/unittests/libtests/meshio/data/hex8_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/hex8_cell_t10.vtk
@@ -20,8 +20,8 @@ POINTS 16 double
0.000000e+00 -1.000000e+00 1.000000e+00
0.000000e+00 1.000000e+00 1.000000e+00
CELLS 2 18
-8 0 12 13 1 6 14 15 7
-8 2 4 5 3 8 10 11 9
+8 0 2 3 1 6 8 9 7
+8 12 4 5 13 14 10 11 15
CELL_TYPES 2
12
12
diff --git a/unittests/libtests/meshio/data/hex8_vertex_t10.vtk b/unittests/libtests/meshio/data/hex8_vertex_t10.vtk
index 605b73a..faa0c69 100644
--- a/unittests/libtests/meshio/data/hex8_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/hex8_vertex_t10.vtk
@@ -20,8 +20,8 @@ POINTS 16 double
0.000000e+00 -1.000000e+00 1.000000e+00
0.000000e+00 1.000000e+00 1.000000e+00
CELLS 2 18
-8 0 12 13 1 6 14 15 7
-8 2 4 5 3 8 10 11 9
+8 0 2 3 1 6 8 9 7
+8 12 4 5 13 14 10 11 15
CELL_TYPES 2
12
12
diff --git a/unittests/libtests/meshio/data/tet4_bc_cell_t10.vtk b/unittests/libtests/meshio/data/tet4_bc_cell_t10.vtk
index 6baf809..67ffb66 100644
--- a/unittests/libtests/meshio/data/tet4_bc_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/tet4_bc_cell_t10.vtk
@@ -10,8 +10,8 @@ POINTS 6 double
0.000000e+00 -1.000000e+00 0.000000e+00
0.000000e+00 1.000000e+00 0.000000e+00
CELLS 2 8
-3 0 2 1
-3 3 4 5
+3 2 1 0
+3 5 3 4
CELL_TYPES 2
5
5
diff --git a/unittests/libtests/meshio/data/tet4_bc_vertex_t10.vtk b/unittests/libtests/meshio/data/tet4_bc_vertex_t10.vtk
index c94e345..0a16839 100644
--- a/unittests/libtests/meshio/data/tet4_bc_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tet4_bc_vertex_t10.vtk
@@ -10,8 +10,8 @@ POINTS 6 double
0.000000e+00 -1.000000e+00 0.000000e+00
0.000000e+00 1.000000e+00 0.000000e+00
CELLS 2 8
-3 0 2 1
-3 3 4 5
+3 2 1 0
+3 5 3 4
CELL_TYPES 2
5
5
diff --git a/unittests/libtests/meshio/data/tet4_points_vertex_t10.vtk b/unittests/libtests/meshio/data/tet4_points_vertex_t10.vtk
index 2e9c096..d22597e 100644
--- a/unittests/libtests/meshio/data/tet4_points_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tet4_points_vertex_t10.vtk
@@ -20,24 +20,24 @@ CELL_TYPES 4
POINT_DATA 4
SCALARS pressure double 1
LOOKUP_TABLE default
-6.500000e+00
-4.300000e+00
-4.300000e+00
-7.600000e+00
+3.566667e+00
+8.700000e+00
+8.700000e+00
+3.200000e+00
VECTORS displacement double
-1.346667e+01 1.423333e+01 1.533333e+01
-7.366667e+00 8.466667e+00 9.566667e+00
-7.200000e+00 8.300000e+00 9.400000e+00
-1.660000e+01 1.770000e+01 1.880000e+01
+5.333333e+00 6.433333e+00 7.533333e+00
+1.956667e+01 2.033333e+01 2.143333e+01
+1.940000e+01 2.050000e+01 2.160000e+01
+4.400000e+00 5.500000e+00 6.600000e+00
SCALARS stress double 6
LOOKUP_TABLE default
-5.100000e+00 5.200000e+00 5.300000e+00 5.400000e+00 5.500000e+00 5.600000e+00
-3.100000e+00 3.200000e+00 3.300000e+00 3.400000e+00 3.500000e+00 3.600000e+00
-3.100000e+00 3.200000e+00 3.300000e+00 3.400000e+00 3.500000e+00 3.600000e+00
-6.100000e+00 6.200000e+00 6.300000e+00 6.400000e+00 6.500000e+00 6.600000e+00
+2.433333e+00 2.533333e+00 2.633333e+00 2.733333e+00 2.833333e+00 2.933333e+00
+7.100000e+00 7.200000e+00 7.300000e+00 7.400000e+00 7.500000e+00 7.600000e+00
+7.100000e+00 7.200000e+00 7.300000e+00 7.400000e+00 7.500000e+00 7.600000e+00
+2.100000e+00 2.200000e+00 2.300000e+00 2.400000e+00 2.500000e+00 2.600000e+00
SCALARS other double 2
LOOKUP_TABLE default
-9.333333e+00 1.043333e+01
-5.600000e+00 6.700000e+00
-5.600000e+00 6.700000e+00
-1.120000e+01 1.230000e+01
+4.133333e+00 5.233333e+00
+1.340000e+01 1.450000e+01
+1.340000e+01 1.450000e+01
+3.400000e+00 4.500000e+00
diff --git a/unittests/libtests/meshio/data/tet4_surf_cell_t10.vtk b/unittests/libtests/meshio/data/tet4_surf_cell_t10.vtk
index 0ad3361..ed02aac 100644
--- a/unittests/libtests/meshio/data/tet4_surf_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/tet4_surf_cell_t10.vtk
@@ -8,8 +8,8 @@ POINTS 4 double
0.000000e+00 1.000000e+00 0.000000e+00
1.000000e+00 0.000000e+00 0.000000e+00
CELLS 2 8
-3 0 2 1
-3 3 1 2
+3 2 1 0
+3 2 3 1
CELL_TYPES 2
5
5
diff --git a/unittests/libtests/meshio/data/tet4_surf_vertex_t10.vtk b/unittests/libtests/meshio/data/tet4_surf_vertex_t10.vtk
index 182b21d..2ce71cd 100644
--- a/unittests/libtests/meshio/data/tet4_surf_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tet4_surf_vertex_t10.vtk
@@ -8,8 +8,8 @@ POINTS 4 double
0.000000e+00 1.000000e+00 0.000000e+00
1.000000e+00 0.000000e+00 0.000000e+00
CELLS 2 8
-3 0 2 1
-3 3 1 2
+3 2 1 0
+3 2 3 1
CELL_TYPES 2
5
5
diff --git a/unittests/libtests/meshio/data/tri3.mesh b/unittests/libtests/meshio/data/tri3.mesh
index 697f0dc..019b4b9 100644
--- a/unittests/libtests/meshio/data/tri3.mesh
+++ b/unittests/libtests/meshio/data/tri3.mesh
@@ -8,22 +8,22 @@
// 1
//
// Mesh with fault
-// 5-7-2
+// 2-7-5
// / | | \
// / | | \
// 0 0 | | 1 3
// \ | | /
// \ | | /
-// 4-6-1
+// 1-6-4
//
// Mesh with fault (Sieve labels)
-// 7-9-4
+// 4-9-7
// / | | \
// / | | \
// 2 0 | | 1 5
// \ | | /
// \ | | /
-// 6-8-3
+// 3-8-6
//
mesh = {
dimension = 2
diff --git a/unittests/libtests/meshio/data/tri3_bc_cell_t10.vtk b/unittests/libtests/meshio/data/tri3_bc_cell_t10.vtk
index 82009c0..5075020 100644
--- a/unittests/libtests/meshio/data/tri3_bc_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_bc_cell_t10.vtk
@@ -3,10 +3,10 @@ Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
POINTS 2 double
-0.000000e+00 -1.000000e+00 0.0
1.000000e+00 0.000000e+00 0.0
+0.000000e+00 -1.000000e+00 0.0
CELLS 1 3
-2 0 1
+2 1 0
CELL_TYPES 1
3
CELL_DATA 1
diff --git a/unittests/libtests/meshio/data/tri3_bc_vertex_t10.vtk b/unittests/libtests/meshio/data/tri3_bc_vertex_t10.vtk
index a822c95..274d921 100644
--- a/unittests/libtests/meshio/data/tri3_bc_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_bc_vertex_t10.vtk
@@ -3,10 +3,10 @@ Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
POINTS 2 double
-0.000000e+00 -1.000000e+00 0.0
1.000000e+00 0.000000e+00 0.0
+0.000000e+00 -1.000000e+00 0.0
CELLS 1 3
-2 0 1
+2 1 0
CELL_TYPES 1
3
POINT_DATA 2
diff --git a/unittests/libtests/meshio/data/tri3_cell_t10.vtk b/unittests/libtests/meshio/data/tri3_cell_t10.vtk
index a85861e..7464fb3 100644
--- a/unittests/libtests/meshio/data/tri3_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_cell_t10.vtk
@@ -10,8 +10,8 @@ POINTS 6 double
0.000000e+00 -1.000000e+00 0.0
0.000000e+00 1.000000e+00 0.0
CELLS 2 8
-3 0 4 5
-3 1 3 2
+3 0 1 2
+3 4 3 5
CELL_TYPES 2
5
5
diff --git a/unittests/libtests/meshio/data/tri3_points_vertex_t10.vtk b/unittests/libtests/meshio/data/tri3_points_vertex_t10.vtk
index 9359a41..fa1a7c9 100644
--- a/unittests/libtests/meshio/data/tri3_points_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_points_vertex_t10.vtk
@@ -17,19 +17,19 @@ CELL_TYPES 3
POINT_DATA 3
SCALARS pressure double 1
LOOKUP_TABLE default
-5.400000e+00
-3.750000e+00
+3.200000e+00
+7.050000e+00
5.400000e+00
VECTORS displacement double
-7.366667e+00 8.133334e+00 0.0
-4.400000e+00 5.500000e+00 0.0
+3.300000e+00 4.400000e+00 0.0
+1.050000e+01 1.110000e+01 0.0
7.700000e+00 8.800000e+00 0.0
VECTORS stress double
-4.100000e+00 4.200000e+00 4.300000e+00
-2.600000e+00 2.700000e+00 2.800000e+00
+2.100000e+00 2.200000e+00 2.300000e+00
+5.600000e+00 5.700000e+00 5.800000e+00
4.100000e+00 4.200000e+00 4.300000e+00
SCALARS other double 2
LOOKUP_TABLE default
-7.133334e+00 8.233334e+00
-4.500000e+00 5.600000e+00
+3.400000e+00 4.500000e+00
+1.010000e+01 1.120000e+01
7.800000e+00 8.900000e+00
diff --git a/unittests/libtests/meshio/data/tri3_surf_cell_t10.vtk b/unittests/libtests/meshio/data/tri3_surf_cell_t10.vtk
index e71545d..67a40f5 100644
--- a/unittests/libtests/meshio/data/tri3_surf_cell_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_surf_cell_t10.vtk
@@ -3,10 +3,10 @@ Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
POINTS 2 double
-0.000000e+00 -1.000000e+00 0.0
1.000000e+00 0.000000e+00 0.0
+0.000000e+00 -1.000000e+00 0.0
CELLS 1 3
-2 0 1
+2 1 0
CELL_TYPES 1
3
CELL_DATA 1
diff --git a/unittests/libtests/meshio/data/tri3_surf_vertex_t10.vtk b/unittests/libtests/meshio/data/tri3_surf_vertex_t10.vtk
index ee44a93..4e38f76 100644
--- a/unittests/libtests/meshio/data/tri3_surf_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_surf_vertex_t10.vtk
@@ -3,24 +3,24 @@ Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
POINTS 2 double
-0.000000e+00 -1.000000e+00 0.0
1.000000e+00 0.000000e+00 0.0
+0.000000e+00 -1.000000e+00 0.0
CELLS 1 3
-2 0 1
+2 1 0
CELL_TYPES 1
3
POINT_DATA 2
SCALARS pressure double 1
LOOKUP_TABLE default
-3.200000e+00
5.400000e+00
+6.500000e+00
VECTORS displacement double
-3.300000e+00 4.400000e+00 0.0
7.700000e+00 8.800000e+00 0.0
+9.900000e+00 1.000000e+01 0.0
VECTORS stress double
-2.100000e+00 2.200000e+00 2.300000e+00
4.100000e+00 4.200000e+00 4.300000e+00
+5.100000e+00 5.200000e+00 5.300000e+00
SCALARS other double 2
LOOKUP_TABLE default
-3.400000e+00 4.500000e+00
7.800000e+00 8.900000e+00
+9.000000e+00 1.010000e+01
diff --git a/unittests/libtests/meshio/data/tri3_vertex_t10.vtk b/unittests/libtests/meshio/data/tri3_vertex_t10.vtk
index ea9f271..0686265 100644
--- a/unittests/libtests/meshio/data/tri3_vertex_t10.vtk
+++ b/unittests/libtests/meshio/data/tri3_vertex_t10.vtk
@@ -10,8 +10,8 @@ POINTS 6 double
0.000000e+00 -1.000000e+00 0.0
0.000000e+00 1.000000e+00 0.0
CELLS 2 8
-3 0 4 5
-3 1 3 2
+3 0 1 2
+3 4 3 5
CELL_TYPES 2
5
5
More information about the CIG-COMMITS
mailing list