[cig-commits] r21919 - in short/3D/PyLith/trunk: libsrc/pylith/faults unittests/libtests/faults/data
knepley at geodynamics.org
knepley at geodynamics.org
Sun Apr 21 17:38:45 PDT 2013
Author: knepley
Date: 2013-04-21 17:38:45 -0700 (Sun, 21 Apr 2013)
New Revision: 21919
Modified:
short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
Log:
Changed method for extracting fault from mesh with cohesive cells, fixed test outputfor improved fault mesh
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -1144,10 +1144,9 @@
DM dmMesh = mesh.dmMesh();
assert(dmMesh);
- //#define OLD_PLEX
-#ifndef OLD_PLEX
DM dmFaultMesh;
{
+#if 0
DMLabel faultLabel;
IS cohesiveIS;
const PetscInt *cohesiveCells;
@@ -1185,9 +1184,11 @@
err = DMPlexCreateSubmesh(dmMesh, labelName, &dmFaultMesh);CHECK_PETSC_ERROR(err);
err = DMPlexRemoveLabel(dmMesh, labelName, &faultLabel);CHECK_PETSC_ERROR(err);
err = DMLabelDestroy(&faultLabel);CHECK_PETSC_ERROR(err);
+#else
+ err = DMPlexCreateCohesiveSubmesh(dmMesh, constraintCell ? PETSC_TRUE : PETSC_FALSE, &dmFaultMesh);CHECK_PETSC_ERROR(err);
+#endif
faultMesh->setDMMesh(dmFaultMesh);
}
-#endif
const int debug = mesh.debug();
const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
@@ -1275,36 +1276,24 @@
fRenumbering,
fault->getArrowSection("orientation").ptr());
}
-#ifdef OLD_PLEX
- SieveMesh::renumbering_type convertRenumbering;
- DM dmFaultMesh;
-
- ALE::ISieveConverter::convertMesh(*fault, &dmFaultMesh, convertRenumbering, true);
- faultMesh->setDMMesh(dmFaultMesh);
-#endif
fault = NULL;
faultSieve = NULL;
- const ALE::Obj<SieveSubMesh::label_sequence>& faultCells =
- faultSieveMesh->heightStratum(0);
+ const ALE::Obj<SieveSubMesh::label_sequence>& faultCells = faultSieveMesh->heightStratum(0);
assert(!faultCells.isNull());
SieveSubMesh::label_sequence::iterator f_iter = faultCells->begin();
// Update coordinates
- const ALE::Obj<topology::Mesh::RealSection>& coordinates =
- sieveMesh->getRealSection("coordinates");
+ const ALE::Obj<topology::Mesh::RealSection>& coordinates = sieveMesh->getRealSection("coordinates");
assert(!coordinates.isNull());
- const ALE::Obj<topology::Mesh::RealSection>& fCoordinates =
- faultSieveMesh->getRealSection("coordinates");
+ const ALE::Obj<topology::Mesh::RealSection>& fCoordinates = faultSieveMesh->getRealSection("coordinates");
assert(!fCoordinates.isNull());
- const ALE::Obj<SieveMesh::label_sequence>& vertices =
- sieveMesh->depthStratum(0);
+ const ALE::Obj<SieveMesh::label_sequence>& vertices = sieveMesh->depthStratum(0);
assert(!vertices.isNull());
const SieveMesh::label_sequence::iterator vBegin = vertices->begin();
const SieveMesh::label_sequence::iterator vEnd = vertices->end();
- const ALE::Obj<SieveMesh::label_sequence>& fvertices =
- faultSieveMesh->depthStratum(0);
+ const ALE::Obj<SieveMesh::label_sequence>& fvertices = faultSieveMesh->depthStratum(0);
assert(!fvertices.isNull());
const point_type fvMin = *std::min_element(fvertices->begin(),
fvertices->end());
@@ -1330,139 +1319,7 @@
fCoordinates->updatePoint(fRenumbering[*v_iter],
coordinates->restrictPoint(*v_iter));
}
-#ifdef OLD_PLEX
- //faultSieveMesh->view("Parallel fault mesh");
- PetscInt numNormalCells, numCohesiveCells, numNormalVertices, numShadowVertices, numLagrangeVertices;
- mesh.getPointTypeSizes(&numNormalCells, &numCohesiveCells, &numNormalVertices, &numShadowVertices, &numLagrangeVertices);
- const SieveMesh::renumbering_type::const_iterator convertRenumberingEnd = convertRenumbering.end();
- PetscSection coordSection, faultCoordSection;
- Vec coordinateVec, faultCoordinateVec;
- PetscScalar *a, *fa;
- PetscInt pvStart, pvEnd, fvStart, fvEnd, n;
-
- err = DMPlexGetDepthStratum(dmMesh, 0, &pvStart, &pvEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetDepthStratum(dmFaultMesh, 0, &fvStart, &fvEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetCoordinateSection(dmMesh, &coordSection);CHECK_PETSC_ERROR(err);
- err = DMPlexGetCoordinateSection(dmFaultMesh, &faultCoordSection);CHECK_PETSC_ERROR(err);
- err = PetscSectionSetChart(faultCoordSection, fvStart, fvEnd);CHECK_PETSC_ERROR(err);
- for(PetscInt v = pvStart; v < pvEnd; ++v) {
- PetscInt sievePoint = convertDMToSievePointNumbering(v, numNormalCells, numCohesiveCells, numNormalVertices, numShadowVertices, numLagrangeVertices);
- PetscInt dof;
-
- if (convertRenumbering.find(sievePoint) == convertRenumberingEnd) continue;
- err = PetscSectionGetDof(coordSection, v, &dof);CHECK_PETSC_ERROR(err);
- err = PetscSectionSetDof(faultCoordSection, convertRenumbering[sievePoint], dof);CHECK_PETSC_ERROR(err);
- }
- err = PetscSectionSetUp(faultCoordSection);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetStorageSize(faultCoordSection, &n);CHECK_PETSC_ERROR(err);
- err = DMGetCoordinatesLocal(dmMesh, &coordinateVec);CHECK_PETSC_ERROR(err);
- err = DMGetCoordinatesLocal(dmFaultMesh, &faultCoordinateVec);CHECK_PETSC_ERROR(err);
- err = VecSetSizes(faultCoordinateVec, n, PETSC_DETERMINE);CHECK_PETSC_ERROR(err);
- err = VecSetFromOptions(faultCoordinateVec);CHECK_PETSC_ERROR(err);
- err = VecGetArray(coordinateVec, &a);CHECK_PETSC_ERROR(err);
- err = VecGetArray(faultCoordinateVec, &fa);CHECK_PETSC_ERROR(err);
- for(PetscInt v = pvStart; v < pvEnd; ++v) {
- PetscInt sievePoint = convertDMToSievePointNumbering(v, numNormalCells, numCohesiveCells, numNormalVertices, numShadowVertices, numLagrangeVertices);
- PetscInt dof, off, foff;
-
- if (convertRenumbering.find(sievePoint) == convertRenumberingEnd) continue;
- err = PetscSectionGetDof(coordSection, v, &dof);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetOffset(coordSection, v, &off);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetOffset(faultCoordSection, convertRenumbering[sievePoint], &foff);CHECK_PETSC_ERROR(err);
- for(PetscInt d = 0; d < dof; ++d) {
- fa[foff+d] = a[off+d];
- }
- }
- err = VecRestoreArray(coordinateVec, &a);CHECK_PETSC_ERROR(err);
- err = VecRestoreArray(faultCoordinateVec, &fa);CHECK_PETSC_ERROR(err);
-#else
- IS subpointIS;
- PetscSection coordSection, faultCoordSection;
- Vec coordinateVec, faultCoordinateVec;
- PetscScalar *a, *fa;
- const PetscInt *points;
- PetscInt pvStart, pvEnd, fvStart, fvEnd, n;
-
- err = DMPlexCreateSubpointIS(dmFaultMesh, &subpointIS);CHECK_PETSC_ERROR(err);
- err = ISGetIndices(subpointIS, &points);CHECK_PETSC_ERROR(err);
- err = DMPlexGetDepthStratum(dmMesh, 0, &pvStart, &pvEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetDepthStratum(dmFaultMesh, 0, &fvStart, &fvEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetCoordinateSection(dmMesh, &coordSection);CHECK_PETSC_ERROR(err);
- err = DMPlexGetCoordinateSection(dmFaultMesh, &faultCoordSection);CHECK_PETSC_ERROR(err);
- err = PetscSectionSetChart(faultCoordSection, fvStart, fvEnd);CHECK_PETSC_ERROR(err);
- for(PetscInt v = fvStart; v < fvEnd; ++v) {
- PetscInt dof;
-
- err = PetscSectionGetDof(coordSection, points[v], &dof);CHECK_PETSC_ERROR(err);
- err = PetscSectionSetDof(faultCoordSection, v, dof);CHECK_PETSC_ERROR(err);
- }
- err = PetscSectionSetUp(faultCoordSection);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetStorageSize(faultCoordSection, &n);CHECK_PETSC_ERROR(err);
- err = DMGetCoordinatesLocal(dmMesh, &coordinateVec);CHECK_PETSC_ERROR(err);
- err = VecCreate(mesh.comm(), &faultCoordinateVec);CHECK_PETSC_ERROR(err);
- err = VecSetSizes(faultCoordinateVec, n, PETSC_DETERMINE);CHECK_PETSC_ERROR(err);
- err = VecSetFromOptions(faultCoordinateVec);CHECK_PETSC_ERROR(err);
- err = VecGetArray(coordinateVec, &a);CHECK_PETSC_ERROR(err);
- err = VecGetArray(faultCoordinateVec, &fa);CHECK_PETSC_ERROR(err);
- for(PetscInt v = fvStart; v < fvEnd; ++v) {
- PetscInt dof, off, foff;
-
- err = PetscSectionGetDof(coordSection, points[v], &dof);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetOffset(coordSection, points[v], &off);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetOffset(faultCoordSection, v, &foff);CHECK_PETSC_ERROR(err);
- for(PetscInt d = 0; d < dof; ++d) {
- fa[foff+d] = a[off+d];
- }
- }
- err = VecRestoreArray(coordinateVec, &a);CHECK_PETSC_ERROR(err);
- err = VecRestoreArray(faultCoordinateVec, &fa);CHECK_PETSC_ERROR(err);
- err = ISRestoreIndices(subpointIS, &points);CHECK_PETSC_ERROR(err);
- err = ISDestroy(&subpointIS);CHECK_PETSC_ERROR(err);
- err = DMSetCoordinatesLocal(dmFaultMesh, faultCoordinateVec);CHECK_PETSC_ERROR(err);
- err = VecDestroy(&faultCoordinateVec);CHECK_PETSC_ERROR(err);
-#endif
-
-#ifdef OLD_PLEX
- // Have to make subpointMap here: renumbering[original] = fault
- DMLabel subpointMap;
- PetscInt *renum;
- PetscInt pStart, pEnd, fcStart, fcEnd;
-
- err = DMLabelCreate("subpoint_map", &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMPlexGetChart(dmFaultMesh, &pStart, &pEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetDepthStratum(dmFaultMesh, 0, &fvStart, &fvEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetHeightStratum(dmFaultMesh, 0, &fcStart, &fcEnd);CHECK_PETSC_ERROR(err);
- assert(convertRenumbering.size() == pEnd-pStart);
- err = PetscMalloc((pEnd-pStart) * sizeof(PetscInt), &renum);CHECK_PETSC_ERROR(err);
-#if 0
- mesh.sieveMesh()->view("Sieve Mesh");
- err = PetscViewerPushFormat(PETSC_VIEWER_STDOUT_WORLD, PETSC_VIEWER_ASCII_INFO_DETAIL);CHECK_PETSC_ERROR(err);
- err = DMView(mesh.dmMesh(), PETSC_VIEWER_STDOUT_WORLD);CHECK_PETSC_ERROR(err);
- err = PetscViewerPopFormat(PETSC_VIEWER_STDOUT_WORLD);CHECK_PETSC_ERROR(err);
-#endif
- for(SieveMesh::renumbering_type::const_iterator p_iter = convertRenumbering.begin(); p_iter != convertRenumbering.end(); ++p_iter) {
- const PetscInt sievePoint = p_iter->first;
- const PetscInt faultPoint = p_iter->second;
- PetscInt dmPoint = convertSieveToDMPointNumbering(sievePoint, numNormalCells, numCohesiveCells, numNormalVertices, numShadowVertices, numLagrangeVertices);
- renum[faultPoint] = dmPoint;
- //std::cout << "renum["<<faultPoint<<"]: "<<dmPoint<<std::endl;
- }
- for(PetscInt p = 1; p < pEnd-pStart; ++p) {
- if (renum[p-1] == -1) continue;
- assert(renum[p] > renum[p-1]);
- }
- for(PetscInt p = fcStart; p < fcEnd; ++p) {
- err = DMLabelSetValue(subpointMap, renum[p], mesh.dimension());CHECK_PETSC_ERROR(err);
- }
- for(PetscInt p = fvStart; p < fvEnd; ++p) {
- err = DMLabelSetValue(subpointMap, renum[p], 0);CHECK_PETSC_ERROR(err);
- }
- err = PetscFree(renum);CHECK_PETSC_ERROR(err);
- err = DMPlexSetSubpointMap(dmFaultMesh, subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelDestroy(&subpointMap);CHECK_PETSC_ERROR(err);
-#endif
-
// Update dimensioned coordinates if they exist.
if (sieveMesh->hasRealSection("coordinates_dimensioned")) {
const ALE::Obj<topology::Mesh::RealSection>& coordinatesDim =
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -178,7 +178,7 @@
const int pylith::faults::CohesiveKinDataHex8::_numFaultVertices = 4;
const int pylith::faults::CohesiveKinDataHex8::_verticesFault[] = {
- 3, 4, 2, 1
+ 4, 5, 3, 2
};
const int pylith::faults::CohesiveKinDataHex8::_verticesLagrange[] = {
21, 22, 20, 19
@@ -192,7 +192,7 @@
const int pylith::faults::CohesiveKinDataHex8::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinDataHex8::_cellMappingFault[] = {
- 5
+ 6
};
const int pylith::faults::CohesiveKinDataHex8::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -137,7 +137,7 @@
const int pylith::faults::CohesiveKinDataQuad4::_numFaultVertices = 2;
const int pylith::faults::CohesiveKinDataQuad4::_verticesFault[] = {
- 1, 2
+ 2, 3
};
const int pylith::faults::CohesiveKinDataQuad4::_verticesLagrange[] = {
11, 12
@@ -151,7 +151,7 @@
const int pylith::faults::CohesiveKinDataQuad4::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinDataQuad4::_cellMappingFault[] = {
- 3
+ 4
};
const int pylith::faults::CohesiveKinDataQuad4::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -187,7 +187,7 @@
const int pylith::faults::CohesiveKinDataQuad4e::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataQuad4e::_verticesFault[] = {
- 3, 2, 4
+ 5, 4, 6
};
const int pylith::faults::CohesiveKinDataQuad4e::_verticesLagrange[] = {
19, 18, 20
@@ -201,7 +201,7 @@
const int pylith::faults::CohesiveKinDataQuad4e::_numCohesiveCells = 2;
const int pylith::faults::CohesiveKinDataQuad4e::_cellMappingFault[] = {
- 5, 6
+ 7, 8
};
const int pylith::faults::CohesiveKinDataQuad4e::_cellMappingCohesive[] = {
4, 5
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -137,7 +137,7 @@
const int pylith::faults::CohesiveKinDataTet4::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataTet4::_verticesFault[] = {
- 2, 1, 3
+ 3, 2, 4
};
const int pylith::faults::CohesiveKinDataTet4::_verticesLagrange[] = {
12, 11, 13
@@ -151,7 +151,7 @@
const int pylith::faults::CohesiveKinDataTet4::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinDataTet4::_cellMappingFault[] = {
- 4
+ 5
};
const int pylith::faults::CohesiveKinDataTet4::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -161,7 +161,7 @@
const int pylith::faults::CohesiveKinDataTet4e::_numFaultVertices = 4;
const int pylith::faults::CohesiveKinDataTet4e::_verticesFault[] = {
- 3, 2, 4, 5
+ 5, 4, 6, 7
};
const int pylith::faults::CohesiveKinDataTet4e::_verticesLagrange[] = {
17, 16, 18, 19
@@ -175,7 +175,7 @@
const int pylith::faults::CohesiveKinDataTet4e::_numCohesiveCells = 2;
const int pylith::faults::CohesiveKinDataTet4e::_cellMappingFault[] = {
- 6, 7
+ 8, 9
};
const int pylith::faults::CohesiveKinDataTet4e::_cellMappingCohesive[] = {
4, 5
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -150,7 +150,7 @@
const int pylith::faults::CohesiveKinDataTet4f::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataTet4f::_verticesFault[] = {
- 3, 1, 2
+ 4, 2, 3
};
const int pylith::faults::CohesiveKinDataTet4f::_verticesLagrange[] = {
13, 11, 12
@@ -164,7 +164,7 @@
const int pylith::faults::CohesiveKinDataTet4f::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinDataTet4f::_cellMappingFault[] = {
- 4
+ 5
};
const int pylith::faults::CohesiveKinDataTet4f::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -133,7 +133,7 @@
const int pylith::faults::CohesiveKinDataTri3::_numFaultVertices = 2;
const int pylith::faults::CohesiveKinDataTri3::_verticesFault[] = {
- 1, 2
+ 2, 3
};
const int pylith::faults::CohesiveKinDataTri3::_verticesLagrange[] = {
9, 10
@@ -147,7 +147,7 @@
const int pylith::faults::CohesiveKinDataTri3::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinDataTri3::_cellMappingFault[] = {
- 3
+ 4
};
const int pylith::faults::CohesiveKinDataTri3::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -174,7 +174,7 @@
const int pylith::faults::CohesiveKinDataTri3d::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinDataTri3d::_verticesFault[] = {
- 4, 2, 3
+ 6, 4, 5
};
const int pylith::faults::CohesiveKinDataTri3d::_verticesLagrange[] = {
17, 15, 16
@@ -188,7 +188,7 @@
const int pylith::faults::CohesiveKinDataTri3d::_numCohesiveCells = 2;
const int pylith::faults::CohesiveKinDataTri3d::_cellMappingFault[] = {
- 5, 6
+ 7, 8
};
const int pylith::faults::CohesiveKinDataTri3d::_cellMappingCohesive[] = {
4, 5
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -190,7 +190,7 @@
const int pylith::faults::CohesiveKinSrcsDataHex8::_numFaultVertices = 4;
const int pylith::faults::CohesiveKinSrcsDataHex8::_verticesFault[] = {
- 3, 4, 2, 1
+ 4, 5, 3, 2
};
const int pylith::faults::CohesiveKinSrcsDataHex8::_verticesLagrange[] = {
21, 22, 20, 19
@@ -204,7 +204,7 @@
const int pylith::faults::CohesiveKinSrcsDataHex8::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinSrcsDataHex8::_cellMappingFault[] = {
- 5
+ 6
};
const int pylith::faults::CohesiveKinSrcsDataHex8::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -145,7 +145,7 @@
const int pylith::faults::CohesiveKinSrcsDataQuad4::_numFaultVertices = 2;
const int pylith::faults::CohesiveKinSrcsDataQuad4::_verticesFault[] = {
- 1, 2
+ 2, 3
};
const int pylith::faults::CohesiveKinSrcsDataQuad4::_verticesLagrange[] = {
11, 12
@@ -159,7 +159,7 @@
const int pylith::faults::CohesiveKinSrcsDataQuad4::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinSrcsDataQuad4::_cellMappingFault[] = {
- 3
+ 4
};
const int pylith::faults::CohesiveKinSrcsDataQuad4::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -149,7 +149,7 @@
const int pylith::faults::CohesiveKinSrcsDataTet4::_numFaultVertices = 3;
const int pylith::faults::CohesiveKinSrcsDataTet4::_verticesFault[] = {
- 2, 1, 3
+ 3, 2, 4
};
const int pylith::faults::CohesiveKinSrcsDataTet4::_verticesLagrange[] = {
12, 11, 13
@@ -163,7 +163,7 @@
const int pylith::faults::CohesiveKinSrcsDataTet4::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinSrcsDataTet4::_cellMappingFault[] = {
- 4
+ 5
};
const int pylith::faults::CohesiveKinSrcsDataTet4::_cellMappingCohesive[] = {
2
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2013-04-20 00:10:18 UTC (rev 21918)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc 2013-04-22 00:38:45 UTC (rev 21919)
@@ -143,7 +143,7 @@
const int pylith::faults::CohesiveKinSrcsDataTri3::_numFaultVertices = 2;
const int pylith::faults::CohesiveKinSrcsDataTri3::_verticesFault[] = {
- 1, 2
+ 2, 3
};
const int pylith::faults::CohesiveKinSrcsDataTri3::_verticesLagrange[] = {
9, 10
@@ -157,7 +157,7 @@
const int pylith::faults::CohesiveKinSrcsDataTri3::_numCohesiveCells = 1;
const int pylith::faults::CohesiveKinSrcsDataTri3::_cellMappingFault[] = {
- 3
+ 4
};
const int pylith::faults::CohesiveKinSrcsDataTri3::_cellMappingCohesive[] = {
2
More information about the CIG-COMMITS
mailing list