[cig-commits] [commit] knepley/upgrade-petsc-interface: Update meshio test data for interpolated meshes. (6be2a62)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Tue Nov 5 17:16:32 PST 2013
Repository : ssh://geoshell/pylith
On branch : knepley/upgrade-petsc-interface
Link : https://github.com/geodynamics/pylith/compare/f4fc4fbe8988e18f1e97a95b95ecae5a8ad9b7e9...6be2a628fb6af0e46a238a4efea20a3d66642864
>---------------------------------------------------------------
commit 6be2a628fb6af0e46a238a4efea20a3d66642864
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Tue Nov 5 17:18:22 2013 -0800
Update meshio test data for interpolated meshes.
>---------------------------------------------------------------
6be2a628fb6af0e46a238a4efea20a3d66642864
unittests/libtests/meshio/TestDataWriterHDF5.cc | 8 ++++---
.../meshio/data/DataWriterHDF5DataMatMeshHex8.cc | 23 +++++----------------
.../meshio/data/DataWriterHDF5DataMatMeshTet4.cc | 21 ++++++-------------
.../meshio/data/DataWriterHDF5DataMatMeshTri3.cc | 18 ++++++----------
.../meshio/data/DataWriterHDF5DataMeshHex8.cc | 23 +++++----------------
.../meshio/data/DataWriterHDF5DataMeshTet4.cc | 21 ++++++-------------
.../meshio/data/DataWriterHDF5DataMeshTri3.cc | 18 ++++++----------
.../meshio/data/DataWriterHDF5DataSubMeshTri3.cc | 18 ++++++----------
unittests/libtests/meshio/data/hex8.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/hex8_bc.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/hex8_bc_cell.h5 | Bin 27496 -> 29088 bytes
unittests/libtests/meshio/data/hex8_bc_vertex.h5 | Bin 28584 -> 29088 bytes
unittests/libtests/meshio/data/hex8_cell.h5 | Bin 27752 -> 29088 bytes
unittests/libtests/meshio/data/hex8_mat.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/hex8_mat_cell.h5 | Bin 27600 -> 29088 bytes
unittests/libtests/meshio/data/hex8_mat_vertex.h5 | Bin 29272 -> 29088 bytes
unittests/libtests/meshio/data/hex8_vertex.h5 | Bin 29384 -> 29344 bytes
unittests/libtests/meshio/data/tet4_bc.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/tet4_bc_cell.h5 | Bin 27512 -> 29088 bytes
unittests/libtests/meshio/data/tet4_bc_vertex.h5 | Bin 27880 -> 29088 bytes
unittests/libtests/meshio/data/tet4_surf.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/tet4_surf_cell.h5 | Bin 27416 -> 29088 bytes
unittests/libtests/meshio/data/tet4_surf_vertex.h5 | Bin 27608 -> 29088 bytes
unittests/libtests/meshio/data/tri3.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/tri3_bc.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/tri3_bc_cell.h5 | Bin 27352 -> 29088 bytes
unittests/libtests/meshio/data/tri3_bc_vertex.h5 | Bin 27352 -> 29088 bytes
unittests/libtests/meshio/data/tri3_cell.h5 | Bin 27352 -> 29088 bytes
unittests/libtests/meshio/data/tri3_mat.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/tri3_mat_cell.h5 | Bin 27352 -> 29088 bytes
unittests/libtests/meshio/data/tri3_mat_vertex.h5 | Bin 27592 -> 29088 bytes
unittests/libtests/meshio/data/tri3_surf.h5 | Bin 9712 -> 11016 bytes
unittests/libtests/meshio/data/tri3_surf_cell.h5 | Bin 27352 -> 29088 bytes
unittests/libtests/meshio/data/tri3_surf_vertex.h5 | Bin 27352 -> 29088 bytes
unittests/libtests/meshio/data/tri3_vertex.h5 | Bin 27592 -> 29088 bytes
35 files changed, 45 insertions(+), 105 deletions(-)
diff --git a/unittests/libtests/meshio/TestDataWriterHDF5.cc b/unittests/libtests/meshio/TestDataWriterHDF5.cc
index ac5bafb..a9dd0c4 100644
--- a/unittests/libtests/meshio/TestDataWriterHDF5.cc
+++ b/unittests/libtests/meshio/TestDataWriterHDF5.cc
@@ -112,11 +112,13 @@ pylith_meshio_TestDataWriterHDF5_checkObject(hid_t id,
// Compare data values.
const double tolerance = 1.0e-6;
CPPUNIT_ASSERT_EQUAL(sizeE, size);
- for (int i=0; i < size; ++i)
- if (dataE[i] != 0.0)
+ for (int i=0; i < size; ++i) {
+ if (dataE[i] != 0.0) {
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, double(data[i])/dataE[i], tolerance);
- else
+ } else {
CPPUNIT_ASSERT_DOUBLES_EQUAL(dataE[i], double(data[i]), tolerance);
+ } // if/else
+ } // for
delete[] dimsE; dimsE = 0;
delete[] dataE; dataE = 0;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshHex8.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshHex8.cc
index 337663d..cfb6d87 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshHex8.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshHex8.cc
@@ -45,7 +45,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataMatMeshHex8::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataMatMeshHex8::_numVertices = 20;
+const int pylith::meshio::DataWriterHDF5DataMatMeshHex8::_numVertices = 16;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataMatMeshHex8::_vertexFields[4] = {
@@ -54,12 +54,11 @@ pylith::meshio::DataWriterHDF5DataMatMeshHex8::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_vertexFieldScalar[20*1] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_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::DataWriterHDF5DataMatMeshHex8::_vertexFieldVector[20*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_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::DataWriterHDF5DataMatMeshHex8::_vertexFieldVe
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::DataWriterHDF5DataMatMeshHex8::_vertexFieldTensor[20*6] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_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::DataWriterHDF5DataMatMeshHex8::_vertexFieldTe
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::DataWriterHDF5DataMatMeshHex8::_vertexFieldOther[20*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_vertexFieldOther[16*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -120,10 +111,6 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshHex8::_vertexFieldOt
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::DataWriterHDF5DataMatMeshHex8::_numCells = 1;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTet4.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTet4.cc
index 5f2fdf4..8edd511 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTet4.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTet4.cc
@@ -45,7 +45,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataMatMeshTet4::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataMatMeshTet4::_numVertices = 11;
+const int pylith::meshio::DataWriterHDF5DataMatMeshTet4::_numVertices = 8;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataMatMeshTet4::_vertexFields[4] = {
@@ -54,10 +54,10 @@ pylith::meshio::DataWriterHDF5DataMatMeshTet4::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_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::DataWriterHDF5DataMatMeshTet4::_vertexFieldScalar[8*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_vertexFieldVector[11*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_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::DataWriterHDF5DataMatMeshTet4::_vertexFieldVe
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::DataWriterHDF5DataMatMeshTet4::_vertexFieldTensor[11*6] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_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::DataWriterHDF5DataMatMeshTet4::_vertexFieldTe
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::DataWriterHDF5DataMatMeshTet4::_vertexFieldOther[11*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_vertexFieldOther[8*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -92,9 +86,6 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTet4::_vertexFieldOt
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::DataWriterHDF5DataMatMeshTet4::_numCells = 2;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTri3.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTri3.cc
index c2e80bb..24d62cc 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataMatMeshTri3.cc
@@ -45,7 +45,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataMatMeshTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataMatMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterHDF5DataMatMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataMatMeshTri3::_vertexFields[4] = {
@@ -54,38 +54,32 @@ pylith::meshio::DataWriterHDF5DataMatMeshTri3::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_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::DataWriterHDF5DataMatMeshTri3::_vertexFieldScalar[8*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_vertexFieldScalar[6*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_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::DataWriterHDF5DataMatMeshTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMatMeshTri3::_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::DataWriterHDF5DataMatMeshTri3::_numCells = 1;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataMeshHex8.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataMeshHex8.cc
index daa20b7..373e8b6 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataMeshHex8.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataMeshHex8.cc
@@ -41,7 +41,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataMeshHex8::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataMeshHex8::_numVertices = 20;
+const int pylith::meshio::DataWriterHDF5DataMeshHex8::_numVertices = 16;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFields[4] = {
@@ -50,12 +50,11 @@ pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldScalar[20*1] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_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
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldVector[20*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldVector[16*3] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
@@ -72,12 +71,8 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldVecto
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,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldTensor[20*6] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_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 +89,8 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldTenso
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::DataWriterHDF5DataMeshHex8::_vertexFieldOther[20*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_vertexFieldOther[16*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -116,10 +107,6 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshHex8::_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
};
const int pylith::meshio::DataWriterHDF5DataMeshHex8::_numCells = 3;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTet4.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTet4.cc
index f0981ff..7eb4768 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTet4.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTet4.cc
@@ -41,7 +41,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataMeshTet4::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataMeshTet4::_numVertices = 11;
+const int pylith::meshio::DataWriterHDF5DataMeshTet4::_numVertices = 8;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFields[4] = {
@@ -50,10 +50,10 @@ pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 6 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_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::DataWriterHDF5DataMeshTet4::_vertexFieldScalar[8*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFieldVector[11*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFieldVector[8*3] = {
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
@@ -62,11 +62,8 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFieldVecto
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::DataWriterHDF5DataMeshTet4::_vertexFieldTensor[11*6] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_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 +72,8 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFieldTenso
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::DataWriterHDF5DataMeshTet4::_vertexFieldOther[11*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_vertexFieldOther[8*2] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
@@ -88,9 +82,6 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTet4::_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,
};
const int pylith::meshio::DataWriterHDF5DataMeshTet4::_numCells = 3;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTri3.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTri3.cc
index f8ab92b..af3e6fd 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataMeshTri3.cc
@@ -41,7 +41,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataMeshTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterHDF5DataMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataMeshTri3::_vertexFields[4] = {
@@ -50,38 +50,32 @@ pylith::meshio::DataWriterHDF5DataMeshTri3::_vertexFields[4] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_vertexFieldScalar[8*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_vertexFieldScalar[6*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_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,
- 23.3, 24.4,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_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::DataWriterHDF5DataMeshTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataMeshTri3::_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.4, 16.5,
};
const int pylith::meshio::DataWriterHDF5DataMeshTri3::_numCells = 3;
diff --git a/unittests/libtests/meshio/data/DataWriterHDF5DataSubMeshTri3.cc b/unittests/libtests/meshio/data/DataWriterHDF5DataSubMeshTri3.cc
index 73a70bd..2fa9e5b 100644
--- a/unittests/libtests/meshio/data/DataWriterHDF5DataSubMeshTri3.cc
+++ b/unittests/libtests/meshio/data/DataWriterHDF5DataSubMeshTri3.cc
@@ -44,7 +44,7 @@ const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_time = 1.0;
const char* pylith::meshio::DataWriterHDF5DataSubMeshTri3::_timeFormat =
"%3.1f";
-const int pylith::meshio::DataWriterHDF5DataSubMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterHDF5DataSubMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterHDF5DataSubMeshTri3::_vertexFields[] = {
@@ -53,38 +53,32 @@ pylith::meshio::DataWriterHDF5DataSubMeshTri3::_vertexFields[] = {
{ "stress", topology::FieldBase::TENSOR, 3 },
{ "other", topology::FieldBase::OTHER, 2 },
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_vertexFieldScalar[8*1] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
+const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_vertexFieldScalar[6*1] = {
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6,
};
-const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_vertexFieldVector[8*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_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::DataWriterHDF5DataSubMeshTri3::_vertexFieldTensor[8*3] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_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::DataWriterHDF5DataSubMeshTri3::_vertexFieldOther[8*2] = {
+const PylithScalar pylith::meshio::DataWriterHDF5DataSubMeshTri3::_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::DataWriterHDF5DataSubMeshTri3::_numCells = 1;
diff --git a/unittests/libtests/meshio/data/hex8.h5 b/unittests/libtests/meshio/data/hex8.h5
index c88d9da..4a2f53b 100644
Binary files a/unittests/libtests/meshio/data/hex8.h5 and b/unittests/libtests/meshio/data/hex8.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_bc.h5 b/unittests/libtests/meshio/data/hex8_bc.h5
index 8e15d41..3446bd0 100644
Binary files a/unittests/libtests/meshio/data/hex8_bc.h5 and b/unittests/libtests/meshio/data/hex8_bc.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_bc_cell.h5 b/unittests/libtests/meshio/data/hex8_bc_cell.h5
index 5443f23..a7d479d 100644
Binary files a/unittests/libtests/meshio/data/hex8_bc_cell.h5 and b/unittests/libtests/meshio/data/hex8_bc_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_bc_vertex.h5 b/unittests/libtests/meshio/data/hex8_bc_vertex.h5
index 697ee93..f660321 100644
Binary files a/unittests/libtests/meshio/data/hex8_bc_vertex.h5 and b/unittests/libtests/meshio/data/hex8_bc_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_cell.h5 b/unittests/libtests/meshio/data/hex8_cell.h5
index f83ae83..cfde42f 100644
Binary files a/unittests/libtests/meshio/data/hex8_cell.h5 and b/unittests/libtests/meshio/data/hex8_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_mat.h5 b/unittests/libtests/meshio/data/hex8_mat.h5
index 50d161e..6113461 100644
Binary files a/unittests/libtests/meshio/data/hex8_mat.h5 and b/unittests/libtests/meshio/data/hex8_mat.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_mat_cell.h5 b/unittests/libtests/meshio/data/hex8_mat_cell.h5
index 5b46997..0d3b620 100644
Binary files a/unittests/libtests/meshio/data/hex8_mat_cell.h5 and b/unittests/libtests/meshio/data/hex8_mat_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_mat_vertex.h5 b/unittests/libtests/meshio/data/hex8_mat_vertex.h5
index f58715e..7d7713e 100644
Binary files a/unittests/libtests/meshio/data/hex8_mat_vertex.h5 and b/unittests/libtests/meshio/data/hex8_mat_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/hex8_vertex.h5 b/unittests/libtests/meshio/data/hex8_vertex.h5
index aaa465e..479c655 100644
Binary files a/unittests/libtests/meshio/data/hex8_vertex.h5 and b/unittests/libtests/meshio/data/hex8_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/tet4_bc.h5 b/unittests/libtests/meshio/data/tet4_bc.h5
index c09b722..eb593c8 100644
Binary files a/unittests/libtests/meshio/data/tet4_bc.h5 and b/unittests/libtests/meshio/data/tet4_bc.h5 differ
diff --git a/unittests/libtests/meshio/data/tet4_bc_cell.h5 b/unittests/libtests/meshio/data/tet4_bc_cell.h5
index 23fe7ac..eb4d139 100644
Binary files a/unittests/libtests/meshio/data/tet4_bc_cell.h5 and b/unittests/libtests/meshio/data/tet4_bc_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/tet4_bc_vertex.h5 b/unittests/libtests/meshio/data/tet4_bc_vertex.h5
index c4f7e23..66ea01f 100644
Binary files a/unittests/libtests/meshio/data/tet4_bc_vertex.h5 and b/unittests/libtests/meshio/data/tet4_bc_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/tet4_surf.h5 b/unittests/libtests/meshio/data/tet4_surf.h5
index bfa9bea..a8dce05 100644
Binary files a/unittests/libtests/meshio/data/tet4_surf.h5 and b/unittests/libtests/meshio/data/tet4_surf.h5 differ
diff --git a/unittests/libtests/meshio/data/tet4_surf_cell.h5 b/unittests/libtests/meshio/data/tet4_surf_cell.h5
index a8eb3b5..4ff6c05 100644
Binary files a/unittests/libtests/meshio/data/tet4_surf_cell.h5 and b/unittests/libtests/meshio/data/tet4_surf_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/tet4_surf_vertex.h5 b/unittests/libtests/meshio/data/tet4_surf_vertex.h5
index 9740866..163cd7a 100644
Binary files a/unittests/libtests/meshio/data/tet4_surf_vertex.h5 and b/unittests/libtests/meshio/data/tet4_surf_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3.h5 b/unittests/libtests/meshio/data/tri3.h5
index 247aab0..346d37c 100644
Binary files a/unittests/libtests/meshio/data/tri3.h5 and b/unittests/libtests/meshio/data/tri3.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_bc.h5 b/unittests/libtests/meshio/data/tri3_bc.h5
index abcaeb2..329e428 100644
Binary files a/unittests/libtests/meshio/data/tri3_bc.h5 and b/unittests/libtests/meshio/data/tri3_bc.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_bc_cell.h5 b/unittests/libtests/meshio/data/tri3_bc_cell.h5
index d0e331d..bdb4a0c 100644
Binary files a/unittests/libtests/meshio/data/tri3_bc_cell.h5 and b/unittests/libtests/meshio/data/tri3_bc_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_bc_vertex.h5 b/unittests/libtests/meshio/data/tri3_bc_vertex.h5
index b791100..d95a067 100644
Binary files a/unittests/libtests/meshio/data/tri3_bc_vertex.h5 and b/unittests/libtests/meshio/data/tri3_bc_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_cell.h5 b/unittests/libtests/meshio/data/tri3_cell.h5
index 585ef3d..7393a39 100644
Binary files a/unittests/libtests/meshio/data/tri3_cell.h5 and b/unittests/libtests/meshio/data/tri3_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_mat.h5 b/unittests/libtests/meshio/data/tri3_mat.h5
index 8b881ed..d8d331b 100644
Binary files a/unittests/libtests/meshio/data/tri3_mat.h5 and b/unittests/libtests/meshio/data/tri3_mat.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_mat_cell.h5 b/unittests/libtests/meshio/data/tri3_mat_cell.h5
index af1750b..7ceaef1 100644
Binary files a/unittests/libtests/meshio/data/tri3_mat_cell.h5 and b/unittests/libtests/meshio/data/tri3_mat_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_mat_vertex.h5 b/unittests/libtests/meshio/data/tri3_mat_vertex.h5
index dba7e84..0e53614 100644
Binary files a/unittests/libtests/meshio/data/tri3_mat_vertex.h5 and b/unittests/libtests/meshio/data/tri3_mat_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_surf.h5 b/unittests/libtests/meshio/data/tri3_surf.h5
index abcaeb2..1b61c4e 100644
Binary files a/unittests/libtests/meshio/data/tri3_surf.h5 and b/unittests/libtests/meshio/data/tri3_surf.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_surf_cell.h5 b/unittests/libtests/meshio/data/tri3_surf_cell.h5
index f250b4d..7db9fff 100644
Binary files a/unittests/libtests/meshio/data/tri3_surf_cell.h5 and b/unittests/libtests/meshio/data/tri3_surf_cell.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_surf_vertex.h5 b/unittests/libtests/meshio/data/tri3_surf_vertex.h5
index 1d8c99c..a3f85e6 100644
Binary files a/unittests/libtests/meshio/data/tri3_surf_vertex.h5 and b/unittests/libtests/meshio/data/tri3_surf_vertex.h5 differ
diff --git a/unittests/libtests/meshio/data/tri3_vertex.h5 b/unittests/libtests/meshio/data/tri3_vertex.h5
index e2c2196..2530f94 100644
Binary files a/unittests/libtests/meshio/data/tri3_vertex.h5 and b/unittests/libtests/meshio/data/tri3_vertex.h5 differ
More information about the CIG-COMMITS
mailing list