[cig-commits] r14651 - in short/3D/PyLith/branches/pylith-swig: libsrc/utils unittests/libtests/meshio unittests/libtests/meshio/data
brad at geodynamics.org
brad at geodynamics.org
Thu Apr 9 19:57:52 PDT 2009
Author: brad
Date: 2009-04-09 19:57:51 -0700 (Thu, 09 Apr 2009)
New Revision: 14651
Removed:
short/3D/PyLith/branches/pylith-swig/libsrc/utils/vectorfields.hh
Modified:
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestDataWriterVTK.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKData.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
Log:
Updated mesh output unit tests.
Deleted: short/3D/PyLith/branches/pylith-swig/libsrc/utils/vectorfields.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/utils/vectorfields.hh 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/utils/vectorfields.hh 2009-04-10 02:57:51 UTC (rev 14651)
@@ -1,37 +0,0 @@
-// -*- C++ -*-
-//
-// ======================================================================
-//
-// Brad T. Aagaard
-// U.S. Geological Survey
-//
-// {LicenseText}
-//
-// ======================================================================
-//
-
-/**
- * @file pylith/utils/realspaces.hh
- *
- * @brief Categories of real vector space types.
- */
-
-#if !defined(pylith_utils_vectorfields_hh)
-#define pylith_utils_vectorfields_hh
-
-namespace pylith {
-
- /// Enumeration of types of vector fields.
- enum VectorFieldEnum {
- SCALAR_FIELD, ///< Scalar field
- VECTOR_FIELD, ///< Vector field
- TENSOR_FIELD, ///< Tensor field
- OTHER_FIELD ///< Other type of field
- }; // VectorFieldEnum
-
-} // pylith
-
-#endif // pylith_utils_vectorfields_hh
-
-
-// End of file
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/Makefile.am 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/Makefile.am 2009-04-10 02:57:51 UTC (rev 14651)
@@ -29,13 +29,13 @@
TestDataWriterVTK.cc \
TestDataWriterVTKMesh.cc \
TestDataWriterVTKMeshLine2.cc \
+ TestDataWriterVTKMeshTri3.cc \
+ TestDataWriterVTKMeshQuad4.cc \
+ TestDataWriterVTKMeshTet4.cc \
+ TestDataWriterVTKMeshHex8.cc \
test_meshio.cc
-# TestDataWriterVTKMeshTri3.cc \
-# TestDataWriterVTKMeshQuad4.cc \
-# TestDataWriterVTKMeshTet4.cc \
-# TestDataWriterVTKMeshHex8.cc \
# TestDataWriterVTKSubMeshLine2.cc \
# TestDataWriterVTKSubMeshTri3.cc \
# TestDataWriterVTKSubMeshQuad4.cc \
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestDataWriterVTK.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestDataWriterVTK.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/TestDataWriterVTK.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -284,6 +284,7 @@
topology::Field<topology::Mesh>& field = fields->get(name);
field.newSection(topology::FieldBase::VERTICES_FIELD, fiberDim);
field.allocate();
+ field.vectorFieldType(_data->vertexFieldsInfo[i].field_type);
const ALE::Obj<topology::Mesh::RealSection>& section = field.section();
CPPUNIT_ASSERT(!section.isNull());
@@ -331,6 +332,7 @@
topology::Field<topology::Mesh>& field = fields->get(name);
field.newSection(topology::FieldBase::CELLS_FIELD, fiberDim);
field.allocate();
+ field.vectorFieldType(_data->cellFieldsInfo[i].field_type);
const ALE::Obj<topology::Mesh::RealSection>& section = field.section();
CPPUNIT_ASSERT(!section.isNull());
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKData.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKData.hh 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKData.hh 2009-04-10 02:57:51 UTC (rev 14651)
@@ -13,7 +13,7 @@
#if !defined(pylith_meshio_datawritervtkdata_hh)
#define pylith_meshio_datawritervtkdata_hh
-#include "pylith/utils/vectorfields.hh" // USES VectorFieldEnum
+#include "pylith/topology/FieldBase.hh" // USES VectorFieldEnum
namespace pylith {
namespace meshio {
@@ -39,7 +39,7 @@
struct FieldStruct {
char* name; ///< Name of field
- VectorFieldEnum field_type; ///< Type of field.
+ topology::FieldBase::VectorFieldEnum field_type; ///< Type of field.
int fiber_dim; ///< Fiber dimension for field.
}; // FieldStruct
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshHex8.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshHex8.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -43,9 +43,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshHex8::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshHex8::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -76,9 +76,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshHex8::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshHex8::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshQuad4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -39,9 +39,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshQuad4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshQuad4::_vertexField0[] = {
1.1, 2.2,
@@ -62,9 +62,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshQuad4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshQuad4::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTet4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTet4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -43,9 +43,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshTet4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshTet4::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -72,9 +72,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshTet4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshTet4::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataBCMeshTri3.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -43,9 +43,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshTri3::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshTri3::_vertexField0[] = {
1.1, 2.2,
@@ -64,9 +64,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataBCMeshTri3::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataBCMeshTri3::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshHex8.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshHex8::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshHex8::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -65,9 +65,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshHex8::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshHex8::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshQuad4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshQuad4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshQuad4::_vertexField0[] = {
1.1, 2.2,
@@ -61,9 +61,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshQuad4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshQuad4::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTet4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshTet4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshTet4::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -63,9 +63,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshTet4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshTet4::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataFaultMeshTri3.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshTri3::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshTri3::_vertexField0[] = {
1.1, 2.2,
@@ -61,9 +61,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataFaultMeshTri3::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataFaultMeshTri3::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -99,9 +99,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshHex8::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataMeshHex8::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshLine2::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 1 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 1 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField0[] = {
1.1, 2.2, 3.3, 4.4, 5.5
@@ -63,9 +63,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshLine2::_cellFields[] = {
- { "traction", VECTOR_FIELD, 1 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 1 },
+ { "traction", topology::FieldBase::VECTOR, 1 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 1 },
};
const double pylith::meshio::DataWriterVTKDataMeshLine2::_cellField0[] = {
1.1, 2.2, 3.3
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -36,9 +36,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshQuad4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshQuad4::_vertexField0[] = {
1.1, 2.2,
@@ -65,9 +65,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshQuad4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataMeshQuad4::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -79,9 +79,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTet4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_vertexField0[] = {
1.1, 2.2,
@@ -71,9 +71,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataMeshTri3::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataMeshTri3::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -44,9 +44,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -103,9 +103,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshHex8::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshHex8::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -44,9 +44,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 1 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 1 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField0[] = {
1.1, 2.2, 3.3, 4.4, 5.5
@@ -67,9 +67,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellFields[] = {
- { "traction", VECTOR_FIELD, 1 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 1 },
+ { "traction", topology::FieldBase::VECTOR, 1 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 1 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshLine2::_cellField0[] = {
1.1,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -40,9 +40,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshQuad4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshQuad4::_vertexField0[] = {
1.1, 2.2,
@@ -69,9 +69,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshQuad4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshQuad4::_cellField0[] = {
1.1, 2.2,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -44,9 +44,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexField0[] = {
1.1, 2.2, 3.3,
@@ -83,9 +83,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTet4::_cellFields[] = {
- { "traction", VECTOR_FIELD, 3 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 6 },
+ { "traction", topology::FieldBase::VECTOR, 3 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 6 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshTet4::_cellField0[] = {
1.1, 2.2, 3.3,
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc 2009-04-09 21:53:24 UTC (rev 14650)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc 2009-04-10 02:57:51 UTC (rev 14651)
@@ -44,9 +44,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFields[] = {
- { "displacements", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", OTHER_FIELD, 2 },
+ { "displacements", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::OTHER, 2 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexField0[] = {
1.1, 2.2,
@@ -77,9 +77,9 @@
const pylith::meshio::DataWriterVTKData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTri3::_cellFields[] = {
- { "traction", VECTOR_FIELD, 2 },
- { "pressure", SCALAR_FIELD, 1 },
- { "other", TENSOR_FIELD, 3 },
+ { "traction", topology::FieldBase::VECTOR, 2 },
+ { "pressure", topology::FieldBase::SCALAR, 1 },
+ { "other", topology::FieldBase::TENSOR, 3 },
};
const double pylith::meshio::DataWriterVTKDataSubMeshTri3::_cellField0[] = {
1.1, 2.2,
More information about the CIG-COMMITS
mailing list