[cig-commits] r11285 - short/3D/PyLith/trunk/unittests/libtests/meshio/data
brad at geodynamics.org
brad at geodynamics.org
Wed Feb 27 21:56:03 PST 2008
Author: brad
Date: 2008-02-27 21:56:03 -0800 (Wed, 27 Feb 2008)
New Revision: 11285
Modified:
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_cell_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_vertex_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_cell_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_vertex_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_t10.vtk
short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex_t10.vtk
Log:
Added faults to meshes in several output tests.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc 2008-02-28 05:56:03 UTC (rev 11285)
@@ -17,6 +17,10 @@
const char* pylith::meshio::DataWriterVTKDataMeshHex8::_meshFilename =
"data/hex8.mesh";
+const char* pylith::meshio::DataWriterVTKDataMeshHex8::_faultLabel =
+ "fault";
+const int pylith::meshio::DataWriterVTKDataMeshHex8::_faultId = 100;
+
const char* pylith::meshio::DataWriterVTKDataMeshHex8::_timestepFilename =
"hex8.vtk";
@@ -32,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertices = 12;
+const int pylith::meshio::DataWriterVTKDataMeshHex8::_numVertices = 16;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFields[] = {
@@ -53,9 +57,14 @@
4.6, 5.7, 6.8,
7.9, 8.0, 9.1,
10.2, 11.3, 12.4,
+ 13.5, 14.6, 15.7,
+ 16.8, 17.9, 18.1,
+ 19.2, 20.3, 21.4,
+ 22.5, 23.6, 24.7,
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8, 10.0, 12.1, 11.1, 13.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
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_vertexField2[] = {
1.2, 2.3,
@@ -69,11 +78,15 @@
1.3, 2.4,
3.5, 4.6,
5.7, 6.8,
- 7.9, 8.0,
+ 8.0, 1.4,
+ 2.5, 3.6,
+ 4.8, 1.5,
+ 2.6, 3.7,
+ 4.8, 5.9,
};
const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCellFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCells = 1;
+const int pylith::meshio::DataWriterVTKDataMeshHex8::_numCells = 2;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_cellFields[] = {
@@ -96,6 +109,8 @@
pylith::meshio::DataWriterVTKDataMeshHex8::DataWriterVTKDataMeshHex8(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
+ faultLabel = const_cast<char*>(_faultLabel);
+ faultId = _faultId;
timestepFilename = const_cast<char*>(_timestepFilename);
vertexFilename = const_cast<char*>(_vertexFilename);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.hh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -38,6 +38,8 @@
private:
static const char* _meshFilename; ///< Name of mesh file.
+ static const char* _faultLabel; ///< Name of group of vertices for fault.
+ static const int _faultId; ///< Material identifier for fault.
static const char* _timestepFilename; ///< Name of VTK file without fields.
static const char* _vertexFilename; ///< Name of VTK file for vertex fields.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc 2008-02-28 05:56:03 UTC (rev 11285)
@@ -17,6 +17,10 @@
const char* pylith::meshio::DataWriterVTKDataMeshLine2::_meshFilename =
"data/line2.mesh";
+const char* pylith::meshio::DataWriterVTKDataMeshLine2::_faultLabel =
+ "fault";
+const int pylith::meshio::DataWriterVTKDataMeshLine2::_faultId = 100;
+
const char* pylith::meshio::DataWriterVTKDataMeshLine2::_timestepFilename =
"line2.vtk";
@@ -32,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshLine2::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshLine2::_numVertices = 3;
+const int pylith::meshio::DataWriterVTKDataMeshLine2::_numVertices = 4;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshLine2::_vertexFields[] = {
@@ -41,15 +45,16 @@
{ "other", OTHER_FIELD, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField0[] = {
- 1.1, 2.2, 3.3,
+ 1.1, 2.2, 3.3, 4.4
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField1[] = {
- 2.1, 3.2, 4.3,
+ 2.1, 3.2, 4.3, 5.4
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField2[] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
+ 7.8, 8.9,
};
const int pylith::meshio::DataWriterVTKDataMeshLine2::_numCellFields = 3;
@@ -74,6 +79,8 @@
pylith::meshio::DataWriterVTKDataMeshLine2::DataWriterVTKDataMeshLine2(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
+ faultLabel = const_cast<char*>(_faultLabel);
+ faultId = _faultId;
timestepFilename = const_cast<char*>(_timestepFilename);
vertexFilename = const_cast<char*>(_vertexFilename);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.hh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -38,6 +38,8 @@
private:
static const char* _meshFilename; ///< Name of mesh file.
+ static const char* _faultLabel; ///< Name of group of vertices for fault.
+ static const int _faultId; ///< Material identifier for fault.
static const char* _timestepFilename; ///< Name of VTK file without fields.
static const char* _vertexFilename; ///< Name of VTK file for vertex fields.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc 2008-02-28 05:56:03 UTC (rev 11285)
@@ -17,6 +17,10 @@
const char* pylith::meshio::DataWriterVTKDataMeshTet4::_meshFilename =
"data/tet4.mesh";
+const char* pylith::meshio::DataWriterVTKDataMeshTet4::_faultLabel =
+ "fault";
+const int pylith::meshio::DataWriterVTKDataMeshTet4::_faultId = 100;
+
const char* pylith::meshio::DataWriterVTKDataMeshTet4::_timestepFilename =
"tet4.vtk";
@@ -32,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertices = 4;
+const int pylith::meshio::DataWriterVTKDataMeshTet4::_numVertices = 8;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFields[] = {
@@ -44,20 +48,28 @@
1.1, 2.2, 3.3,
4.4, 5.5, 6.6,
7.7, 8.8, 9.9,
- 10.1, 11.2, 12.3
+ 10.0, 11.1, 12.2,
+ 13.3, 14.4, 15.5,
+ 16.6, 17.7, 18.8,
+ 19.9, 20.0, 21.1,
+ 22.2, 23.3, 24.4,
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4,
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_vertexField2[] = {
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::DataWriterVTKDataMeshTet4::_numCellFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTet4::_numCells = 1;
+const int pylith::meshio::DataWriterVTKDataMeshTet4::_numCells = 2;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_cellFields[] = {
@@ -66,18 +78,22 @@
{ "other", TENSOR_FIELD, 6 },
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField0[] = {
- 1.1, 2.2, 3.3
+ 1.1, 2.2, 3.3,
+ 4.4, 5.5, 6.6,
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField1[] = {
- 2.1,
+ 2.1, 3.2
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField2[] = {
- 1.2, 2.3, 3.4, 4.5, 5.6, 6.7
+ 1.2, 2.3, 3.4, 4.5, 5.6, 6.7,
+ 7.8, 8.9, 9.0, 10.1, 11.2, 12.3,
};
pylith::meshio::DataWriterVTKDataMeshTet4::DataWriterVTKDataMeshTet4(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
+ faultLabel = const_cast<char*>(_faultLabel);
+ faultId = _faultId;
timestepFilename = const_cast<char*>(_timestepFilename);
vertexFilename = const_cast<char*>(_vertexFilename);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.hh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -38,6 +38,8 @@
private:
static const char* _meshFilename; ///< Name of mesh file.
+ static const char* _faultLabel; ///< Name of group of vertices for fault.
+ static const int _faultId; ///< Material identifier for fault.
static const char* _timestepFilename; ///< Name of VTK file without fields.
static const char* _vertexFilename; ///< Name of VTK file for vertex fields.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc 2008-02-28 05:56:03 UTC (rev 11285)
@@ -17,6 +17,10 @@
const char* pylith::meshio::DataWriterVTKDataMeshTri3::_meshFilename =
"data/tri3.mesh";
+const char* pylith::meshio::DataWriterVTKDataMeshTri3::_faultLabel =
+ "fault";
+const int pylith::meshio::DataWriterVTKDataMeshTri3::_faultId = 100;
+
const char* pylith::meshio::DataWriterVTKDataMeshTri3::_timestepFilename =
"tri3.vtk";
@@ -32,7 +36,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertices = 4;
+const int pylith::meshio::DataWriterVTKDataMeshTri3::_numVertices = 6;
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFields[] = {
@@ -44,16 +48,20 @@
1.1, 2.2,
3.3, 4.4,
5.5, 6.6,
- 7.7, 8.8
+ 7.7, 8.8,
+ 9.9, 10.0,
+ 11.1, 12.2
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4
+ 2.1, 3.2, 4.3, 5.4, 6.5, 7.6
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_vertexField2[] = {
1.2, 2.3,
3.4, 4.5,
5.6, 6.7,
- 7.8, 8.9
+ 7.8, 8.9,
+ 9.0, 10.1,
+ 11.2, 12.3
};
const int pylith::meshio::DataWriterVTKDataMeshTri3::_numCellFields = 3;
@@ -80,6 +88,8 @@
pylith::meshio::DataWriterVTKDataMeshTri3::DataWriterVTKDataMeshTri3(void)
{ // constructor
meshFilename = const_cast<char*>(_meshFilename);
+ faultLabel = const_cast<char*>(_faultLabel);
+ faultId = _faultId;
timestepFilename = const_cast<char*>(_timestepFilename);
vertexFilename = const_cast<char*>(_vertexFilename);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.hh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -38,6 +38,8 @@
private:
static const char* _meshFilename; ///< Name of mesh file.
+ static const char* _faultLabel; ///< Name of group of vertices for fault.
+ static const int _faultId; ///< Material identifier for fault.
static const char* _timestepFilename; ///< Name of VTK file without fields.
static const char* _vertexFilename; ///< Name of VTK file for vertex fields.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8.mesh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -13,19 +13,21 @@
// 1 ----- 0
//
//
-// Sieve mesh
+// Mesh with fault
//
-// 13 -----12
-// / | / |
-// / | / |
-// 11 -----10 |
-// / | 7 /-|-- 6
-// / | / / | /
-// 9 ----- 8 |/ 1
-// | 5 --|-- 4
+// 11 -----10
+// / | / |
+// / | / |
+// 9 ----- 8 |
+// | 5 --|-- 4
+// 15 ---- 14| /
+// / | / /||/ 1
+// / 3 ---/-|2
+// 7 ----- 6 |
+// | 13 --|--12
// | / | /
// |/ |/ 0
-// 3 ----- 2
+// 1 ----- 0
//
mesh = {
dimension = 3
@@ -61,19 +63,27 @@
}
}
group = {
- name = bc
+ name = fault
type = vertices
count = 4
indices = {
+ 2 3 8 9
+ }
+ }
+ group = {
+ name = front
+ type = vertices
+ count = 4
+ indices = {
0 1 6 7
}
}
group = {
- name = bc2
+ name = top
type = vertices
count = 6
indices = {
- 0 2 4 6 8 10
+ 6 7 8 9 10 11
}
}
}
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_cell_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_cell_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_cell_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,7 +2,7 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 12 double
+POINTS 16 double
-1 -1 -1
-1 1 -1
0 -1 -1
@@ -15,8 +15,12 @@
0 1 1
1 -1 1
1 1 1
+0 -1 -1
+0 1 -1
+0 -1 1
+0 1 1
CELLS 2 18
-8 0 2 3 1 6 8 9 7
+8 0 12 13 1 6 14 15 7
8 2 4 5 3 8 10 11 9
CELL_TYPES 2
12
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,7 +2,7 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 12 double
+POINTS 16 double
-1 -1 -1
-1 1 -1
0 -1 -1
@@ -15,8 +15,12 @@
0 1 1
1 -1 1
1 1 1
+0 -1 -1
+0 1 -1
+0 -1 1
+0 1 1
CELLS 2 18
-8 0 2 3 1 6 8 9 7
+8 0 12 13 1 6 14 15 7
8 2 4 5 3 8 10 11 9
CELL_TYPES 2
12
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_vertex_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_vertex_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/hex8_vertex_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,7 +2,7 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 12 double
+POINTS 16 double
-1 -1 -1
-1 1 -1
0 -1 -1
@@ -15,13 +15,17 @@
0 1 1
1 -1 1
1 1 1
+0 -1 -1
+0 1 -1
+0 -1 1
+0 1 1
CELLS 2 18
-8 0 2 3 1 6 8 9 7
+8 0 12 13 1 6 14 15 7
8 2 4 5 3 8 10 11 9
CELL_TYPES 2
12
12
-POINT_DATA 12
+POINT_DATA 16
VECTORS displacements double
1.1 2.2 3.3
4.4 5.5 6.6
@@ -35,6 +39,10 @@
4.6 5.7 6.8
7.9 8 9.1
10.2 11.3 12.4
+13.5 14.6 15.7
+16.8 17.9 18.1
+19.2 20.3 21.4
+22.5 23.6 24.7
SCALARS pressure double 1
LOOKUP_TABLE default
2.1
@@ -49,6 +57,10 @@
12.1
11.1
13.1
+14.1
+15.1
+16.1
+17.1
SCALARS other double 2
LOOKUP_TABLE default
1.2 2.3
@@ -62,4 +74,8 @@
1.3 2.4
3.5 4.6
5.7 6.8
-7.9 8
+8 1.4
+2.5 3.6
+4.8 1.5
+2.6 3.7
+4.8 5.9
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2.mesh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -3,9 +3,9 @@
// 0 ----- 1 ----- 2
// 0 1
//
-// Sieve mesh
-// 2 ----- 3 ----- 4
-// 0 1
+// Mesh with fault
+// 0 ----- 3 - 1 ----- 2
+// 0 1
//
mesh = {
dimension = 1
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_cell_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_cell_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_cell_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,12 +2,13 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 3 double
+POINTS 4 double
-1 0.0 0.0
0 0.0 0.0
1 0.0 0.0
+0 0.0 0.0
CELLS 2 6
-2 0 1
+2 0 3
2 1 2
CELL_TYPES 2
3
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,12 +2,13 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 3 double
+POINTS 4 double
-1 0.0 0.0
0 0.0 0.0
1 0.0 0.0
+0 0.0 0.0
CELLS 2 6
-2 0 1
+2 0 3
2 1 2
CELL_TYPES 2
3
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_vertex_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_vertex_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/line2_vertex_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,28 +2,32 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 3 double
+POINTS 4 double
-1 0.0 0.0
0 0.0 0.0
1 0.0 0.0
+0 0.0 0.0
CELLS 2 6
-2 0 1
+2 0 3
2 1 2
CELL_TYPES 2
3
3
-POINT_DATA 3
+POINT_DATA 4
VECTORS displacements double
1.1 0.0 0.0
2.2 0.0 0.0
3.3 0.0 0.0
+4.4 0.0 0.0
SCALARS pressure double 1
LOOKUP_TABLE default
2.1
3.2
4.3
+5.4
SCALARS other double 2
LOOKUP_TABLE default
1.2 2.3
3.4 4.5
5.6 6.7
+7.8 8.9
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4.mesh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4.mesh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -3,46 +3,51 @@
use-index-zero = true
vertices = {
dimension = 3
- count = 4
+ count = 5
coordinates = {
- 0 0.0 0.0 0.0
- 1 1.0 0.0 0.0
- 2 0.0 1.0 0.0
- 3 0.0 0.0 1.0
+ 0 -1.0 0.0 0.0
+ 1 0.0 -1.0 0.0
+ 2 0.0 0.0 1.0
+ 3 0.0 1.0 0.0
+ 4 1.0 0.0 0.0
}
}
cells = {
- count = 1
+ count = 2
num-corners = 4
simplices = {
- 0 0 1 2 3
+ 0 1 2 3 0
+ 1 1 3 2 4
}
material-ids = {
- 0 0
+ 0 1
+ 1 1
}
}
group = {
- name = bc
+ name = fault
type = vertices
- count = 1
+ count = 3
indices = {
+ 1
2
+ 3
}
}
group = {
- name = bc2
+ name = boundary
type = vertices
- count = 3
+ count = 4
indices = {
- 0 2 3
+ 0 1 3 4
}
}
group = {
- name = bc3
+ name = face
type = vertices
count = 3
indices = {
- 1 2 3
+ 0 1 2
}
}
}
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_cell_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,21 +2,30 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 4 double
-0 0 0
+POINTS 8 double
+-1 0 0
+0 -1 0
+0 0 1
+0 1 0
1 0 0
+0 -1 0
+0 0 1
0 1 0
-0 0 1
-CELLS 1 5
-4 0 1 2 3
-CELL_TYPES 1
+CELLS 2 10
+4 1 2 3 0
+4 5 7 6 4
+CELL_TYPES 2
10
-CELL_DATA 1
+10
+CELL_DATA 2
VECTORS traction double
1.1 2.2 3.3
+4.4 5.5 6.6
SCALARS pressure double 1
LOOKUP_TABLE default
2.1
+3.2
SCALARS other double 6
LOOKUP_TABLE default
1.2 2.3 3.4 4.5 5.6 6.7
+7.8 8.9 9 10.1 11.2 12.3
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,12 +2,18 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 4 double
-0 0 0
+POINTS 8 double
+-1 0 0
+0 -1 0
+0 0 1
+0 1 0
1 0 0
+0 -1 0
+0 0 1
0 1 0
-0 0 1
-CELLS 1 5
-4 0 1 2 3
-CELL_TYPES 1
+CELLS 2 10
+4 1 2 3 0
+4 5 7 6 4
+CELL_TYPES 2
10
+10
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tet4_vertex_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,30 +2,48 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 4 double
-0 0 0
+POINTS 8 double
+-1 0 0
+0 -1 0
+0 0 1
+0 1 0
1 0 0
+0 -1 0
+0 0 1
0 1 0
-0 0 1
-CELLS 1 5
-4 0 1 2 3
-CELL_TYPES 1
+CELLS 2 10
+4 1 2 3 0
+4 5 7 6 4
+CELL_TYPES 2
10
-POINT_DATA 4
+10
+POINT_DATA 8
VECTORS displacements double
1.1 2.2 3.3
4.4 5.5 6.6
7.7 8.8 9.9
-10.1 11.2 12.3
+10 11.1 12.2
+13.3 14.4 15.5
+16.6 17.7 18.8
+19.9 20 21.1
+22.2 23.3 24.4
SCALARS pressure double 1
LOOKUP_TABLE default
2.1
3.2
4.3
5.4
+6.5
+7.6
+8.7
+9.8
SCALARS other double 2
LOOKUP_TABLE default
1.2 2.3
3.4 4.5
5.6 6.7
7.8 8.9
+9 10.1
+11.2 12.3
+13.4 14.5
+15.6 16.7
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3.mesh 2008-02-28 05:56:03 UTC (rev 11285)
@@ -1,20 +1,20 @@
// Original mesh
-// 2
-// / | \
-// / | \
-// 0 0 | 1 3
-// \ | /
-// \ | /
-// 1
+// 2
+// / | \
+// / | \
+// 0 0 | 1 3
+// \ | /
+// \ | /
+// 1
//
-// Sieve mesh
-// 4
-// / | \
-// / | \
-// 2 0 | 1 5
-// \ | /
-// \ | /
-// 3
+// Mesh with fault
+// 5 - 2
+// / | | \
+// / | | \
+// 0 0 | | 1 3
+// \ | | /
+// \ | | /
+// 4 - 1
//
mesh = {
dimension = 2
@@ -42,6 +42,14 @@
}
}
group = {
+ name = fault
+ type = vertices
+ count = 2
+ indices = {
+ 1 2
+ }
+ }
+ group = {
name = bc
type = vertices
count = 2
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_cell_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,13 +2,15 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 4 double
+POINTS 6 double
-1 0 0.0
0 -1 0.0
0 1 0.0
1 0 0.0
+0 -1 0.0
+0 1 0.0
CELLS 2 8
-3 0 1 2
+3 0 4 5
3 1 3 2
CELL_TYPES 2
5
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,13 +2,15 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 4 double
+POINTS 6 double
-1 0 0.0
0 -1 0.0
0 1 0.0
1 0 0.0
+0 -1 0.0
+0 1 0.0
CELLS 2 8
-3 0 1 2
+3 0 4 5
3 1 3 2
CELL_TYPES 2
5
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex_t10.vtk
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex_t10.vtk 2008-02-28 04:33:25 UTC (rev 11284)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/tri3_vertex_t10.vtk 2008-02-28 05:56:03 UTC (rev 11285)
@@ -2,32 +2,40 @@
Simplicial Mesh Example
ASCII
DATASET UNSTRUCTURED_GRID
-POINTS 4 double
+POINTS 6 double
-1 0 0.0
0 -1 0.0
0 1 0.0
1 0 0.0
+0 -1 0.0
+0 1 0.0
CELLS 2 8
-3 0 1 2
+3 0 4 5
3 1 3 2
CELL_TYPES 2
5
5
-POINT_DATA 4
+POINT_DATA 6
VECTORS displacements double
1.1 2.2 0.0
3.3 4.4 0.0
5.5 6.6 0.0
7.7 8.8 0.0
+9.9 10 0.0
+11.1 12.2 0.0
SCALARS pressure double 1
LOOKUP_TABLE default
2.1
3.2
4.3
5.4
+6.5
+7.6
SCALARS other double 2
LOOKUP_TABLE default
1.2 2.3
3.4 4.5
5.6 6.7
7.8 8.9
+9 10.1
+11.2 12.3
More information about the cig-commits
mailing list