[cig-commits] r11181 - in short/3D/PyLith/trunk/unittests/libtests/meshio: . data

brad at geodynamics.org brad at geodynamics.org
Mon Feb 18 20:13:47 PST 2008


Author: brad
Date: 2008-02-18 20:13:47 -0800 (Mon, 18 Feb 2008)
New Revision: 11181

Modified:
   short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
   short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
Log:
Cleaned up memory management of data for output unit tests.

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTK.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -138,8 +138,9 @@
   writer.open(_mesh, &cs, numTimeSteps);
   writer.openTimeStep(t, _mesh, &cs);
   for (int i=0; i < nfields; ++i) {
-    writer.writeVertexField(t, _data->vertexFields[i].name,
-			    vertexFields[i], _data->vertexFields[i].field_type,
+    writer.writeVertexField(t, _data->vertexFieldsInfo[i].name,
+			    vertexFields[i], 
+			    _data->vertexFieldsInfo[i].field_type,
 			    _mesh);
     CPPUNIT_ASSERT(writer._wroteVertexHeader);
     CPPUNIT_ASSERT(false == writer._wroteCellHeader);
@@ -178,8 +179,9 @@
   writer.open(_mesh, &cs, numTimeSteps);
   writer.openTimeStep(t, _mesh, &cs);
   for (int i=0; i < nfields; ++i) {
-    writer.writeCellField(t, _data->cellFields[i].name,
-			    cellFields[i], _data->cellFields[i].field_type,
+    writer.writeCellField(t, _data->cellFieldsInfo[i].name,
+			    cellFields[i], 
+			  _data->cellFieldsInfo[i].field_type,
 			    _mesh);
     CPPUNIT_ASSERT(false == writer._wroteVertexHeader);
     CPPUNIT_ASSERT(writer._wroteCellHeader);
@@ -213,7 +215,7 @@
     fields->resize(nfields);
     for (int i=0; i < nfields; ++i) {
       (*fields)[i] = new real_section_type(_mesh->comm(), _mesh->debug());
-      const int fiberDim = _data->vertexFields[i].fiber_dim;
+      const int fiberDim = _data->vertexFieldsInfo[i].fiber_dim;
       (*fields)[i]->setFiberDimension(vertices, fiberDim);
       _mesh->allocate((*fields)[i]);
 
@@ -221,7 +223,7 @@
       for (Mesh::label_sequence::iterator v_iter=vertices->begin();
 	   v_iter != verticesEnd;
 	   ++v_iter, ++ipt) {
-	const double* values = &_data->vertexFields[i].values[ipt*fiberDim];
+	const double* values = &_data->vertexFields[i][ipt*fiberDim];
 	(*fields)[i]->updatePoint(*v_iter, values);
       } // for
     } // for
@@ -251,7 +253,7 @@
     fields->resize(nfields);
     for (int i=0; i < nfields; ++i) {
       (*fields)[i] = new real_section_type(_mesh->comm(), _mesh->debug());
-      const int fiberDim = _data->cellFields[i].fiber_dim;
+      const int fiberDim = _data->cellFieldsInfo[i].fiber_dim;
       (*fields)[i]->setFiberDimension(cells, fiberDim);
       _mesh->allocate((*fields)[i]);
 
@@ -259,7 +261,7 @@
       for (Mesh::label_sequence::iterator c_iter=cells->begin();
 	   c_iter != cellsEnd;
 	   ++c_iter, ++icell) {
-	const double* values = &_data->cellFields[i].values[icell*fiberDim];
+	const double* values = &_data->cellFields[i][icell*fiberDim];
 	(*fields)[i]->updatePoint(*c_iter, values);
       } // for
     } // for

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -22,10 +22,10 @@
   timeFormat(0),
   numVertexFields(0),
   numVertices(0),
-  vertexFields(0),
+  vertexFieldsInfo(0),
   numCellFields(0),
   numCells(0),
-  cellFields(0)
+  cellFieldsInfo(0)
 { // constructor
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKData.hh	2008-02-19 04:13:47 UTC (rev 11181)
@@ -41,7 +41,6 @@
     char* name; ///< Name of field
     VectorFieldEnum field_type; ///< Type of field.
     int fiber_dim; ///< Fiber dimension for field.
-    double* values; ///< Values for field.
   }; // FieldStruct
 
 // PUBLIC MEMBERS ///////////////////////////////////////////////////////
@@ -58,14 +57,16 @@
   //@{
   int numVertexFields; ///< Number of vertex fields.
   int numVertices; ///< Number of vertices.
-  FieldStruct* vertexFields; ///< Array of vertex fields.
+  FieldStruct* vertexFieldsInfo; ///< Array of vertex field information.
+  double* vertexFields[3]; ///< Array of vertex field values.
   //@}
 
   /// @name Cell field information.
   //@{
   int numCellFields; ///< Number of cell fields.
   int numCells; ///< Number of vertices.
-  FieldStruct* cellFields; ///< Array of cell fields.
+  FieldStruct* cellFieldsInfo; ///< Array of cell fields information.
+  double* cellFields[3]; /// Array of cell field values.
   //@}
 
 }; // DataWriterVTKData

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshHex8.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -12,6 +12,8 @@
 
 #include "DataWriterVTKDataMeshHex8.hh"
 
+#include <assert.h> // USES assert()
+
 const char* pylith::meshio::DataWriterVTKDataMeshHex8::_meshFilename = 
   "data/hex8.mesh";
 
@@ -34,9 +36,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshHex8::_vertexFields[] = {
-  { "displacements", VECTOR_FIELD, 3, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", OTHER_FIELD, 2, 0 },
+  { "displacements", VECTOR_FIELD, 3 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", OTHER_FIELD, 2 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshHex8::_vertexField0[] = {
   1.1, 2.2, 3.3,
@@ -75,9 +77,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshHex8::_cellFields[] = {
-  { "traction", VECTOR_FIELD, 3, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", TENSOR_FIELD, 6, 0 },
+  { "traction", VECTOR_FIELD, 3 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", TENSOR_FIELD, 6 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshHex8::_cellField0[] = {
   1.1, 2.2, 3.3,
@@ -104,17 +106,19 @@
   
   numVertexFields = _numVertexFields;
   numVertices = _numVertices;
-  vertexFields = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
-  vertexFields[0].values = const_cast<double*>(_vertexField0);
-  vertexFields[1].values = const_cast<double*>(_vertexField1);
-  vertexFields[2].values = const_cast<double*>(_vertexField2);
+  assert(3 == numVertexFields);
+  vertexFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
+  vertexFields[0] = const_cast<double*>(_vertexField0);
+  vertexFields[1] = const_cast<double*>(_vertexField1);
+  vertexFields[2] = const_cast<double*>(_vertexField2);
 
   numCellFields = _numCellFields;
   numVertices = _numVertices;
-  cellFields = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
-  cellFields[0].values = const_cast<double*>(_cellField0);
-  cellFields[1].values = const_cast<double*>(_cellField1);
-  cellFields[2].values = const_cast<double*>(_cellField2);
+  assert(3 == numCellFields);
+  cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
+  cellFields[0] = const_cast<double*>(_cellField0);
+  cellFields[1] = const_cast<double*>(_cellField1);
+  cellFields[2] = const_cast<double*>(_cellField2);
 } // constructor
 
 pylith::meshio::DataWriterVTKDataMeshHex8::~DataWriterVTKDataMeshHex8(void)

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshLine2.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -12,6 +12,8 @@
 
 #include "DataWriterVTKDataMeshLine2.hh"
 
+#include <assert.h> // USES assert()
+
 const char* pylith::meshio::DataWriterVTKDataMeshLine2::_meshFilename = 
   "data/line2.mesh";
 
@@ -34,9 +36,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshLine2::_vertexFields[] = {
-  { "displacements", VECTOR_FIELD, 1, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", OTHER_FIELD, 2, 0 },
+  { "displacements", VECTOR_FIELD, 1 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", OTHER_FIELD, 2 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshLine2::_vertexField0[] = {
   1.1, 2.2, 3.3,
@@ -55,9 +57,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshLine2::_cellFields[] = {
-  { "traction", VECTOR_FIELD, 1, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", TENSOR_FIELD, 1, 0 },
+  { "traction", VECTOR_FIELD, 1 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", TENSOR_FIELD, 1 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshLine2::_cellField0[] = {
   1.1, 2.2,
@@ -82,17 +84,19 @@
   
   numVertexFields = _numVertexFields;
   numVertices = _numVertices;
-  vertexFields = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
-  vertexFields[0].values = const_cast<double*>(_vertexField0);
-  vertexFields[1].values = const_cast<double*>(_vertexField1);
-  vertexFields[2].values = const_cast<double*>(_vertexField2);
+  assert(3 == numVertexFields);
+  vertexFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
+  vertexFields[0] = const_cast<double*>(_vertexField0);
+  vertexFields[1] = const_cast<double*>(_vertexField1);
+  vertexFields[2] = const_cast<double*>(_vertexField2);
 
   numCellFields = _numCellFields;
   numVertices = _numVertices;
-  cellFields = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
-  cellFields[0].values = const_cast<double*>(_cellField0);
-  cellFields[1].values = const_cast<double*>(_cellField1);
-  cellFields[2].values = const_cast<double*>(_cellField2);
+  assert(3 == numCellFields);
+  cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
+  cellFields[0] = const_cast<double*>(_cellField0);
+  cellFields[1] = const_cast<double*>(_cellField1);
+  cellFields[2] = const_cast<double*>(_cellField2);
 } // constructor
 
 pylith::meshio::DataWriterVTKDataMeshLine2::~DataWriterVTKDataMeshLine2(void)

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshQuad4.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -12,6 +12,8 @@
 
 #include "DataWriterVTKDataMeshQuad4.hh"
 
+#include <assert.h> // USES assert()
+
 const char* pylith::meshio::DataWriterVTKDataMeshQuad4::_meshFilename = 
   "data/quad4.mesh";
 
@@ -34,9 +36,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshQuad4::_vertexFields[] = {
-  { "displacements", VECTOR_FIELD, 2, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", OTHER_FIELD, 2, 0 },
+  { "displacements", VECTOR_FIELD, 2 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", OTHER_FIELD, 2 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshQuad4::_vertexField0[] = {
   1.1, 2.2,
@@ -63,9 +65,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshQuad4::_cellFields[] = {
-  { "traction", VECTOR_FIELD, 2, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", TENSOR_FIELD, 3, 0 },
+  { "traction", VECTOR_FIELD, 2 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", TENSOR_FIELD, 3 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshQuad4::_cellField0[] = {
   1.1, 2.2,
@@ -91,18 +93,20 @@
   timeFormat = const_cast<char*>(_timeFormat);
   
   numVertexFields = _numVertexFields;
+  assert(3 == numVertexFields);
   numVertices = _numVertices;
-  vertexFields = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
-  vertexFields[0].values = const_cast<double*>(_vertexField0);
-  vertexFields[1].values = const_cast<double*>(_vertexField1);
-  vertexFields[2].values = const_cast<double*>(_vertexField2);
+  vertexFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
+  vertexFields[0] = const_cast<double*>(_vertexField0);
+  vertexFields[1] = const_cast<double*>(_vertexField1);
+  vertexFields[2] = const_cast<double*>(_vertexField2);
 
   numCellFields = _numCellFields;
+  assert(3 == numCellFields);
   numVertices = _numVertices;
-  cellFields = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
-  cellFields[0].values = const_cast<double*>(_cellField0);
-  cellFields[1].values = const_cast<double*>(_cellField1);
-  cellFields[2].values = const_cast<double*>(_cellField2);
+  cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
+  cellFields[0] = const_cast<double*>(_cellField0);
+  cellFields[1] = const_cast<double*>(_cellField1);
+  cellFields[2] = const_cast<double*>(_cellField2);
 } // constructor
 
 pylith::meshio::DataWriterVTKDataMeshQuad4::~DataWriterVTKDataMeshQuad4(void)

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTet4.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -12,6 +12,8 @@
 
 #include "DataWriterVTKDataMeshTet4.hh"
 
+#include <assert.h> // USES assert()
+
 const char* pylith::meshio::DataWriterVTKDataMeshTet4::_meshFilename = 
   "data/tet4.mesh";
 
@@ -34,9 +36,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshTet4::_vertexFields[] = {
-  { "displacements", VECTOR_FIELD, 3, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", OTHER_FIELD, 2, 0 },
+  { "displacements", VECTOR_FIELD, 3 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", OTHER_FIELD, 2 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshTet4::_vertexField0[] = {
   1.1, 2.2, 3.3,
@@ -59,9 +61,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshTet4::_cellFields[] = {
-  { "traction", VECTOR_FIELD, 3, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", TENSOR_FIELD, 6, 0 },
+  { "traction", VECTOR_FIELD, 3 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", TENSOR_FIELD, 6 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshTet4::_cellField0[] = {
   1.1, 2.2, 3.3
@@ -85,18 +87,20 @@
   timeFormat = const_cast<char*>(_timeFormat);
   
   numVertexFields = _numVertexFields;
+  assert(3 == numVertexFields);
   numVertices = _numVertices;
-  vertexFields = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
-  vertexFields[0].values = const_cast<double*>(_vertexField0);
-  vertexFields[1].values = const_cast<double*>(_vertexField1);
-  vertexFields[2].values = const_cast<double*>(_vertexField2);
+  vertexFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
+  vertexFields[0] = const_cast<double*>(_vertexField0);
+  vertexFields[1] = const_cast<double*>(_vertexField1);
+  vertexFields[2] = const_cast<double*>(_vertexField2);
 
   numCellFields = _numCellFields;
+  assert(3 == numCellFields);
   numVertices = _numVertices;
-  cellFields = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
-  cellFields[0].values = const_cast<double*>(_cellField0);
-  cellFields[1].values = const_cast<double*>(_cellField1);
-  cellFields[2].values = const_cast<double*>(_cellField2);
+  cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
+  cellFields[0] = const_cast<double*>(_cellField0);
+  cellFields[1] = const_cast<double*>(_cellField1);
+  cellFields[2] = const_cast<double*>(_cellField2);
 } // constructor
 
 pylith::meshio::DataWriterVTKDataMeshTet4::~DataWriterVTKDataMeshTet4(void)

Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc	2008-02-18 23:28:37 UTC (rev 11180)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataMeshTri3.cc	2008-02-19 04:13:47 UTC (rev 11181)
@@ -12,6 +12,8 @@
 
 #include "DataWriterVTKDataMeshTri3.hh"
 
+#include <assert.h> // USES assert()
+
 const char* pylith::meshio::DataWriterVTKDataMeshTri3::_meshFilename = 
   "data/tri3.mesh";
 
@@ -34,9 +36,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshTri3::_vertexFields[] = {
-  { "displacements", VECTOR_FIELD, 2, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", OTHER_FIELD, 2, 0 },
+  { "displacements", VECTOR_FIELD, 2 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", OTHER_FIELD, 2 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshTri3::_vertexField0[] = {
   1.1, 2.2,
@@ -59,9 +61,9 @@
 
 const pylith::meshio::DataWriterVTKData::FieldStruct
 pylith::meshio::DataWriterVTKDataMeshTri3::_cellFields[] = {
-  { "traction", VECTOR_FIELD, 2, 0 },
-  { "pressure", SCALAR_FIELD, 1, 0 },
-  { "other", TENSOR_FIELD, 3, 0 },
+  { "traction", VECTOR_FIELD, 2 },
+  { "pressure", SCALAR_FIELD, 1 },
+  { "other", TENSOR_FIELD, 3 },
 };
 const double pylith::meshio::DataWriterVTKDataMeshTri3::_cellField0[] = {
   1.1, 2.2,
@@ -88,17 +90,19 @@
   
   numVertexFields = _numVertexFields;
   numVertices = _numVertices;
-  vertexFields = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
-  vertexFields[0].values = const_cast<double*>(_vertexField0);
-  vertexFields[1].values = const_cast<double*>(_vertexField1);
-  vertexFields[2].values = const_cast<double*>(_vertexField2);
+  assert(3 == numVertexFields);
+  vertexFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_vertexFields);
+  vertexFields[0] = const_cast<double*>(_vertexField0);
+  vertexFields[1] = const_cast<double*>(_vertexField1);
+  vertexFields[2] = const_cast<double*>(_vertexField2);
 
   numCellFields = _numCellFields;
   numVertices = _numVertices;
-  cellFields = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
-  cellFields[0].values = const_cast<double*>(_cellField0);
-  cellFields[1].values = const_cast<double*>(_cellField1);
-  cellFields[2].values = const_cast<double*>(_cellField2);
+  assert(3 == numCellFields);
+  cellFieldsInfo = const_cast<DataWriterVTKData::FieldStruct*>(_cellFields);
+  cellFields[0] = const_cast<double*>(_cellField0);
+  cellFields[1] = const_cast<double*>(_cellField1);
+  cellFields[2] = const_cast<double*>(_cellField2);
 } // constructor
 
 pylith::meshio::DataWriterVTKDataMeshTri3::~DataWriterVTKDataMeshTri3(void)



More information about the cig-commits mailing list