[cig-commits] r21333 - in short/3D/PyLith/trunk/libsrc/pylith: bc faults topology
knepley at geodynamics.org
knepley at geodynamics.org
Mon Feb 4 18:43:02 PST 2013
Author: knepley
Date: 2013-02-04 18:43:02 -0800 (Mon, 04 Feb 2013)
New Revision: 21333
Modified:
short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc
short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
Log:
Use DMPlexCreateSubpointIS
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc 2013-02-05 02:42:39 UTC (rev 21332)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc 2013-02-05 02:43:02 UTC (rev 21333)
@@ -281,15 +281,13 @@
// Get cell information
DM subMesh = _boundaryMesh->dmMesh();
- DMLabel subpointMap;
IS subpointIS;
PetscInt cStart, cEnd;
PetscErrorCode err;
assert(subMesh);
err = DMPlexGetHeightStratum(subMesh, 1, &cStart, &cEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetSubpointMap(subMesh, &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(subMesh, &subpointIS);CHECK_PETSC_ERROR(err);
// Get sections
PetscSection valueSection = _parameters->get("damping constants").petscSection();
@@ -440,15 +438,13 @@
// Get cell information
DM subMesh = _boundaryMesh->dmMesh();
- DMLabel subpointMap;
IS subpointIS;
PetscInt cStart, cEnd;
PetscErrorCode err;
assert(subMesh);
err = DMPlexGetHeightStratum(subMesh, 1, &cStart, &cEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetSubpointMap(subMesh, &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(subMesh, &subpointIS);CHECK_PETSC_ERROR(err);
// Get sections
PetscSection valueSection = _parameters->get("damping constants").petscSection();
@@ -596,15 +592,13 @@
// Get cell information
DM subMesh = _boundaryMesh->dmMesh();
- DMLabel subpointMap;
IS subpointIS;
PetscInt cStart, cEnd;
PetscErrorCode err;
assert(subMesh);
err = DMPlexGetHeightStratum(subMesh, 1, &cStart, &cEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetSubpointMap(subMesh, &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(subMesh, &subpointIS);CHECK_PETSC_ERROR(err);
// Get sections
PetscSection valueSection = _parameters->get("damping constants").petscSection();
@@ -762,15 +756,13 @@
// Get cell information
DM subMesh = _boundaryMesh->dmMesh();
- DMLabel subpointMap;
IS subpointIS;
PetscInt cStart, cEnd;
PetscErrorCode err;
assert(subMesh);
err = DMPlexGetHeightStratum(subMesh, 1, &cStart, &cEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetSubpointMap(subMesh, &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(subMesh, &subpointIS);CHECK_PETSC_ERROR(err);
// Get parameters used in integration.
const PylithScalar dt = _dt;
Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc 2013-02-05 02:42:39 UTC (rev 21332)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/Neumann.cc 2013-02-05 02:43:02 UTC (rev 21333)
@@ -107,15 +107,13 @@
// Get cell information
DM subMesh = _boundaryMesh->dmMesh();
- DMLabel subpointMap;
IS subpointIS;
PetscInt cStart, cEnd;
PetscErrorCode err;
assert(subMesh);
err = DMPlexGetHeightStratum(subMesh, 1, &cStart, &cEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetSubpointMap(subMesh, &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(subMesh, &subpointIS);CHECK_PETSC_ERROR(err);
// Get sections
_calculateValue(t);
Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc 2013-02-05 02:42:39 UTC (rev 21332)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc 2013-02-05 02:43:02 UTC (rev 21333)
@@ -1118,16 +1118,13 @@
const int numCorners = 3 * numConstraintVert; // cohesive cell
DM faultDMMesh = _faultMesh->dmMesh();
- DMLabel subpointMap;
- IS subvertexIS;
+ IS subpointIS;
const PetscInt *points;
PetscInt numPoints, fcStart, fcEnd, fvStart, fvEnd;
assert(faultDMMesh);
err = DMPlexGetHeightStratum(faultDMMesh, 0, &fcStart, &fcEnd);CHECK_PETSC_ERROR(err);
err = DMPlexGetDepthStratum(faultDMMesh, 0, &fvStart, &fvEnd);CHECK_PETSC_ERROR(err);
- err = DMPlexGetSubpointMap(faultDMMesh, &subpointMap);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumSize(subpointMap, 0, &numPoints);CHECK_PETSC_ERROR(err);
assert(numCells == fcEnd-fcStart);
_cohesiveToFault.clear();
@@ -1137,8 +1134,9 @@
PetscInt index = 0;
err = ISGetIndices(cellIS, &cells);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subvertexIS);CHECK_PETSC_ERROR(err);
- err = ISGetIndices(subvertexIS, &points);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(faultDMMesh, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = ISGetLocalSize(subpointIS, &numPoints);CHECK_PETSC_ERROR(err);
+ err = ISGetIndices(subpointIS, &points);CHECK_PETSC_ERROR(err);
for(PetscInt c = 0; c < numCells; ++c) {
_cohesiveToFault[cells[c]] = c;
@@ -1189,8 +1187,8 @@
err = DMPlexRestoreTransitiveClosure(dmMesh, cells[c], PETSC_TRUE, &closureSize, &closure);CHECK_PETSC_ERROR(err);
} // for
err = ISRestoreIndices(cellIS, &cells);CHECK_PETSC_ERROR(err);
- err = ISRestoreIndices(subvertexIS, &points);CHECK_PETSC_ERROR(err);
- err = ISDestroy(&subvertexIS);CHECK_PETSC_ERROR(err);
+ err = ISRestoreIndices(subpointIS, &points);CHECK_PETSC_ERROR(err);
+ err = ISDestroy(&subpointIS);CHECK_PETSC_ERROR(err);
} // _initializeCohesiveInfo
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc 2013-02-05 02:42:39 UTC (rev 21332)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/Field.cc 2013-02-05 02:43:02 UTC (rev 21333)
@@ -1593,14 +1593,14 @@
err = DMPlexGetSubpointMap(_dm, &subpointMapF);CHECK_PETSC_ERROR(err);
if (((dim != dimF) || ((pEnd-pStart) < (qEnd-qStart))) && subpointMap && !subpointMapF) {
const PetscInt *ind;
- IS subvertexIS;
+ IS subpointIS;
PetscInt n, q;
err = PetscPrintf(PETSC_COMM_SELF, "Making translation PetscSection\n");CHECK_PETSC_ERROR(err);
err = PetscSectionGetChart(section, &qStart, &qEnd);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumSize(subpointMap, 0, &n);CHECK_PETSC_ERROR(err);
- err = DMLabelGetStratumIS(subpointMap, 0, &subvertexIS);CHECK_PETSC_ERROR(err);
- err = ISGetIndices(subvertexIS, &ind);CHECK_PETSC_ERROR(err);
+ err = DMPlexCreateSubpointIS(dm, &subpointIS);CHECK_PETSC_ERROR(err);
+ err = ISGetLocalSize(subpointIS, &n);CHECK_PETSC_ERROR(err);
+ err = ISGetIndices(subpointIS, &ind);CHECK_PETSC_ERROR(err);
err = PetscSectionCreate(mesh.comm(), &subSection);CHECK_PETSC_ERROR(err);
err = PetscSectionSetChart(subSection, pStart, pEnd);CHECK_PETSC_ERROR(err);
for(q = qStart; q < qEnd; ++q) {
@@ -1616,8 +1616,8 @@
}
}
}
- err = ISRestoreIndices(subvertexIS, &ind);CHECK_PETSC_ERROR(err);
- err = ISDestroy(&subvertexIS);CHECK_PETSC_ERROR(err);
+ err = ISRestoreIndices(subpointIS, &ind);CHECK_PETSC_ERROR(err);
+ err = ISDestroy(&subpointIS);CHECK_PETSC_ERROR(err);
/* No need to setup section */
section = subSection;
}
More information about the CIG-COMMITS
mailing list