[cig-commits] r20807 - in short/3D/PyLith/trunk: libsrc/pylith/faults unittests/libtests/meshio unittests/libtests/meshio/data
knepley at geodynamics.org
knepley at geodynamics.org
Fri Oct 5 21:40:03 PDT 2012
Author: knepley
Date: 2012-10-05 21:40:03 -0700 (Fri, 05 Oct 2012)
New Revision: 20807
Modified:
short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5ExtSubMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.hh
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshCases.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
Log:
Fixed label conversion in CohesiveTopology, fixed SubMesh vertex tests
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -379,10 +379,12 @@
if (group->getFiberDimension(*v_iter))
group->addPoint(firstFaultVertex, 1);
+ PetscInt vertexDM = *v_iter+faultVertexOffsetDM;
PetscInt value;
- err = DMComplexGetLabelValue(complexMesh, (*name).c_str(), *v_iter+extraCells, &value);CHECK_PETSC_ERROR(err);
+ //assert(extraCells == faultVertexOffsetDM);
+ err = DMComplexGetLabelValue(complexMesh, (*name).c_str(), vertexDM, &value);CHECK_PETSC_ERROR(err);
if (value) {
- err = DMComplexSetLabelValue(newMesh, (*name).c_str(), firstFaultVertexDM, value);CHECK_PETSC_ERROR(err);
+ err = DMComplexSetLabelValue(newMesh, (*name).c_str(), vertexRenumberDM[vertexDM], value);CHECK_PETSC_ERROR(err);
}
} // for
} // for
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5ExtSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5ExtSubMesh.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5ExtSubMesh.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -57,7 +57,7 @@
void
pylith::meshio::TestDataWriterHDF5ExtSubMesh::testConstructor(void)
{ // testConstructor
- DataWriterHDF5Ext<topology::SubMesh, MeshField> writer;
+ DataWriterHDF5Ext<topology::SubMesh, SubMeshField> writer;
} // testConstructor
// ----------------------------------------------------------------------
@@ -68,7 +68,7 @@
CPPUNIT_ASSERT(0 != _mesh);
CPPUNIT_ASSERT(0 != _data);
- DataWriterHDF5Ext<topology::SubMesh, MeshField> writer;
+ DataWriterHDF5Ext<topology::SubMesh, SubMeshField> writer;
writer.filename(_data->timestepFilename);
@@ -95,9 +95,9 @@
CPPUNIT_ASSERT(0 != _mesh);
CPPUNIT_ASSERT(0 != _data);
- DataWriterHDF5Ext<topology::SubMesh, MeshField> writer;
+ DataWriterHDF5Ext<topology::SubMesh, SubMeshField> writer;
- topology::Fields<MeshField> vertexFields(*_mesh);
+ topology::Fields<SubMeshField> vertexFields(*_submesh);
_createVertexFields(&vertexFields);
writer.filename(_data->vertexFilename);
@@ -118,7 +118,7 @@
writer.openTimeStep(t, *_submesh, label, id);
} // else
for (int i=0; i < nfields; ++i) {
- MeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
+ SubMeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
writer.writeVertexField(t, field, *_submesh);
} // for
writer.closeTimeStep();
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -97,9 +97,9 @@
CPPUNIT_ASSERT(0 != _mesh);
CPPUNIT_ASSERT(0 != _data);
- DataWriterHDF5<topology::SubMesh, MeshField> writer;
+ DataWriterHDF5<topology::SubMesh, SubMeshField> writer;
- topology::Fields<MeshField> vertexFields(*_mesh);
+ topology::Fields<SubMeshField> vertexFields(*_submesh);
_createVertexFields(&vertexFields);
writer.filename(_data->vertexFilename);
@@ -120,7 +120,7 @@
writer.openTimeStep(t, *_submesh, label, id);
} // else
for (int i=0; i < nfields; ++i) {
- MeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
+ SubMeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
writer.writeVertexField(t, field, *_submesh);
} // for
writer.closeTimeStep();
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -103,7 +103,7 @@
// Create vertex fields.
void
pylith::meshio::TestDataWriterSubMesh::_createVertexFields(
- topology::Fields<MeshField>* fields) const
+ topology::Fields<SubMeshField>* fields) const
{ // _createVertexFields
CPPUNIT_ASSERT(0 != fields);
CPPUNIT_ASSERT(0 != _mesh);
@@ -112,7 +112,7 @@
try {
const int nfields = _data->numVertexFields;
- DM dmMesh = _mesh->dmMesh();
+ DM dmMesh = _submesh->dmMesh();
PetscInt vStart, vEnd;
PetscErrorCode err;
@@ -124,7 +124,7 @@
const char* name = _data->vertexFieldsInfo[i].name;
const int fiberDim = _data->vertexFieldsInfo[i].fiber_dim;
fields->add(name, name);
- MeshField& field = fields->get(name);
+ SubMeshField& field = fields->get(name);
field.newSection(topology::FieldBase::VERTICES_FIELD, fiberDim);
field.allocate();
field.vectorFieldType(_data->vertexFieldsInfo[i].field_type);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.hh 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterSubMesh.hh 2012-10-06 04:40:03 UTC (rev 20807)
@@ -59,7 +59,7 @@
* @param fields Vertex fields.
*/
void
- _createVertexFields(topology::Fields<topology::Field<topology::Mesh> >* fields) const;
+ _createVertexFields(topology::Fields<topology::Field<topology::SubMesh> >* fields) const;
/** Create cell fields.
*
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshCases.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshCases.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKFaultMeshCases.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -40,7 +40,7 @@
{ // setUp
TestDataWriterVTKFaultMesh::setUp();
_data = new DataWriterVTKDataFaultMeshTri3;
- _flipFault = true;
+ _flipFault = false;
_initialize();
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMesh.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterVTKSubMesh.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -112,9 +112,9 @@
CPPUNIT_ASSERT(0 != _mesh);
CPPUNIT_ASSERT(0 != _data);
- DataWriterVTK<topology::SubMesh, MeshField> writer;
+ DataWriterVTK<topology::SubMesh, SubMeshField> writer;
- topology::Fields<MeshField> vertexFields(*_mesh);
+ topology::Fields<SubMeshField> vertexFields(*_submesh);
_createVertexFields(&vertexFields);
writer.filename(_data->vertexFilename);
@@ -134,7 +134,7 @@
writer.openTimeStep(t, *_submesh, label, id);
} // else
for (int i=0; i < nfields; ++i) {
- MeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
+ SubMeshField& field = vertexFields.get(_data->vertexFieldsInfo[i].name);
writer.writeVertexField(t, field, *_submesh);
CPPUNIT_ASSERT(writer._wroteVertexHeader);
CPPUNIT_ASSERT(false == writer._wroteCellHeader);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshHex8.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -44,7 +44,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numVertices = 12;
+const int pylith::meshio::DataWriterVTKDataSubMeshHex8::_numVertices = 6;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexFields[] = {
@@ -53,12 +53,6 @@
{ "other", topology::FieldBase::OTHER, 2 },
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexField0[] = {
- 1.1, 2.2, 3.3,
- 4.4, 5.5, 6.6,
- 7.7, 8.8, 9.9,
- 10.1, 11.2, 12.3,
- 1.2, 2.3, 3.4,
- 4.5, 5.6, 6.7,
7.8, 8.9, 9.0,
10.2, 11.3, 12.4,
1.3, 2.4, 3.5,
@@ -67,15 +61,9 @@
10.3, 11.4, 12.5,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8, 10.9, 11.8, 12.7, 13.6
+ 8.7, 9.8, 10.9, 11.8, 12.7, 13.6
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshHex8::_vertexField2[] = {
- 1.2, 2.3,
- 3.4, 4.5,
- 5.6, 6.7,
- 7.8, 8.9,
- 1.3, 2.4,
- 3.5, 4.6,
5.7, 6.8,
7.9, 8.0,
8.1, 8.2,
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshLine2.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -45,7 +45,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertices = 5;
+const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numVertices = 1;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexFields[] = {
@@ -55,20 +55,12 @@
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField0[] = {
1.1, 2.2,
- 3.3, 4.4,
- 5.5, 6.6,
- 7.7, 8.8,
- 9.9, 10.0,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5,
+ 2.1
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshLine2::_vertexField2[] = {
1.2, 2.3,
- 3.4, 4.5,
- 5.6, 6.7,
- 7.8, 8.9,
- 9.0, 10.1,
};
const int pylith::meshio::DataWriterVTKDataSubMeshLine2::_numCellFields = 3;
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshQuad4.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -41,7 +41,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshQuad4::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshQuad4::_numVertices = 6;
+const int pylith::meshio::DataWriterVTKDataSubMeshQuad4::_numVertices = 3;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshQuad4::_vertexFields[] = {
@@ -51,22 +51,16 @@
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshQuad4::_vertexField0[] = {
1.1, 2.2,
- 3.3, 4.4,
5.5, 6.6,
- 7.7, 8.8,
9.9, 10.0,
- 11.1, 12.2,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshQuad4::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6,
+ 2.1, 4.3, 6.5,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshQuad4::_vertexField2[] = {
1.2, 2.3,
- 3.4, 4.5,
5.6, 6.7,
- 7.8, 8.9,
9.1, 10.2,
- 11.3, 12.4,
};
const int pylith::meshio::DataWriterVTKDataSubMeshQuad4::_numCellFields = 3;
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTet4.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -44,7 +44,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numVertices = 5;
+const int pylith::meshio::DataWriterVTKDataSubMeshTet4::_numVertices = 4;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexFields[] = {
@@ -55,17 +55,15 @@
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexField0[] = {
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,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5,
+ 2.1, 3.2, 5.4, 6.5,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTet4::_vertexField2[] = {
1.2, 2.3,
3.4, 4.5,
- 5.6, 6.7,
7.8, 8.9,
9.0, 10.1,
};
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc 2012-10-05 19:10:00 UTC (rev 20806)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/data/DataWriterVTKDataSubMeshTri3.cc 2012-10-06 04:40:03 UTC (rev 20807)
@@ -45,7 +45,7 @@
"%3.1f";
const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertexFields = 3;
-const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertices = 8;
+const int pylith::meshio::DataWriterVTKDataSubMeshTri3::_numVertices = 2;
const pylith::meshio::DataWriterData::FieldStruct
pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexFields[] = {
@@ -54,27 +54,15 @@
{ "other", topology::FieldBase::OTHER, 2 },
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexField0[] = {
- 1.1, 2.2,
3.3, 4.4,
- 5.5, 6.6,
7.7, 8.8,
- 9.9, 10.0,
- 11.1, 12.2,
- 13.3, 14.4,
- 15.5, 16.6,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_vertexField1[] = {
- 2.1, 3.2, 4.3, 5.4, 6.5, 7.6, 8.7, 9.8,
+ 3.2, 5.4,
};
const PylithScalar pylith::meshio::DataWriterVTKDataSubMeshTri3::_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::DataWriterVTKDataSubMeshTri3::_numCellFields = 3;
More information about the CIG-COMMITS
mailing list