[cig-commits] r20735 - in short/3D/PyLith/trunk/libsrc/pylith: bc meshio topology

[knepley at geodynamics.org]

Author: knepley
Date: 2012-09-19 10:23:39 -0700 (Wed, 19 Sep 2012)
New Revision: 20735

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
   short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc
   short/3D/PyLith/trunk/libsrc/pylith/topology/SubMesh.cc
Log:
Fixes

Modified: short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc	2012-09-19 16:45:05 UTC (rev 20734)
+++ short/3D/PyLith/trunk/libsrc/pylith/bc/AbsorbingDampers.cc	2012-09-19 17:23:39 UTC (rev 20735)
@@ -299,13 +299,13 @@
   PetscSection residualSection = residual.petscSection();
   Vec          residualVec     = residual.localVector();
   assert(residualSection);assert(residualVec);
-  UpdateAddVisitor residualVisitor(*residualSection, &_cellVector[0]);
+  ///UpdateAddVisitor residualVisitor(*residualSection, &_cellVector[0]);
   
   scalar_array velCell(numBasis*spaceDim);
   PetscSection velSection = fields->get("velocity(t)").petscSection();
-  PetscSection velVec     = fields->get("velocity(t)").localVector();
+  Vec          velVec     = fields->get("velocity(t)").localVector();
   assert(velSection);assert(velVec);
-  RestrictVisitor velVisitor(*velSection, velCell.size(), &velCell[0]);
+  ///RestrictVisitor velVisitor(*velSection, velCell.size(), &velCell[0]);
   
 #if !defined(PRECOMPUTE_GEOMETRY)
   scalar_array coordinatesCell(numBasis*spaceDim);
@@ -344,8 +344,8 @@
     _resetCellVector();
 
     // Restrict input fields to cell
-    velVisitor.clear();
-    sieveSubMesh->restrictClosure(*c_iter, velVisitor);
+    ///velVisitor.clear();
+    ///sieveSubMesh->restrictClosure(*c_iter, velVisitor);
     assert(numQuadPts*spaceDim == 
 	   parametersSection->getFiberDimension(*c_iter));
     const PylithScalar* dampersCell = parametersSection->restrictPoint(*c_iter);
@@ -382,8 +382,8 @@
 #endif
 
     // Assemble cell contribution into field
-    residualVisitor.clear();
-    sieveSubMesh->updateClosure(*c_iter, residualVisitor);
+    ///residualVisitor.clear();
+    ///sieveSubMesh->updateClosure(*c_iter, residualVisitor);
 
 #if defined(DETAILED_EVENT_LOGGING)
     _logger->eventEnd(updateEvent);

Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc	2012-09-19 16:45:05 UTC (rev 20734)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/CellFilterAvg.cc	2012-09-19 17:23:39 UTC (rev 20735)
@@ -111,6 +111,8 @@
     if (cMax >= 0) {cEnd = PetscMin(cEnd, cMax);}
     numCells = cEnd - cStart;
   } else {
+    const PetscInt *cells;
+
     err = DMComplexGetStratumIS(dmMesh, label, 1, &cellIS);CHECK_PETSC_ERROR(err);
     err = ISGetSize(cellIS, &numCells);CHECK_PETSC_ERROR(err);
     err = ISGetIndices(cellIS, &cells);CHECK_PETSC_ERROR(err);

Modified: short/3D/PyLith/trunk/libsrc/pylith/topology/SubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/topology/SubMesh.cc	2012-09-19 16:45:05 UTC (rev 20734)
+++ short/3D/PyLith/trunk/libsrc/pylith/topology/SubMesh.cc	2012-09-19 17:23:39 UTC (rev 20735)
@@ -158,8 +158,8 @@
 
   int maxConeSizeLocal = sieve->getMaxConeSize();
   int maxConeSize = 0;
-  int err = MPI_Allreduce(&maxConeSizeLocal, &maxConeSize, 1, MPI_INT, MPI_MAX,
-			  sieve->comm()); CHECK_PETSC_ERROR(err);
+  err = MPI_Allreduce(&maxConeSizeLocal, &maxConeSize, 1, MPI_INT, MPI_MAX,
+                      sieve->comm()); CHECK_PETSC_ERROR(err);
 
   if (maxConeSize <= 0) {
     std::ostringstream msg;