[cig-commits] r18236 - in short/3D/PyLith/branches/v1.5-stable/libsrc: problems topology

[brad at geodynamics.org]

Author: brad
Date: 2011-04-18 08:20:39 -0700 (Mon, 18 Apr 2011)
New Revision: 18236

Modified:
   short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc
   short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Distributor.cc
Log:
Merge from trunk.

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc	2011-04-18 03:35:09 UTC (rev 18235)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/problems/SolverLinear.cc	2011-04-18 15:20:39 UTC (rev 18236)
@@ -134,6 +134,7 @@
   assert(!solutionSection.isNull());
   const ALE::Obj<SieveMesh>& sieveMesh = solution->mesh().sieveMesh();
   assert(!sieveMesh.isNull());
+#if 0
   if (solutionSection->getNumSpaces() > sieveMesh->getDimension() &&
       0 != _precondMatrix) {
     
@@ -155,8 +156,8 @@
 			  flag); CHECK_PETSC_ERROR(err);
     err = PetscFree(ksps); CHECK_PETSC_ERROR(err);
   } // if
+#endif
 
-
   const PetscVec residualVec = residual.vector();
   const PetscVec solutionVec = solution->vector();
 

Modified: short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Distributor.cc
===================================================================
--- short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Distributor.cc	2011-04-18 03:35:09 UTC (rev 18235)
+++ short/3D/PyLith/branches/v1.5-stable/libsrc/topology/Distributor.cc	2011-04-18 15:20:39 UTC (rev 18236)
@@ -249,9 +249,9 @@
         } // if
       }
       if (origSieveMesh->height(firstPoint) == 0) {
-        newSection->setChart(IntSection::chart_type(0, numCells));
+        newSection->setChart(IntSection::chart_type(0, parallelCoordinates->getChart().min()));
       } else {
-        newSection->setChart(IntSection::chart_type(numCells, numCells+numVertices));
+        newSection->setChart(parallelCoordinates->getChart());
       } // if/else
       DistributionType::distributeSection(origSection, partition, renumbering,
                                           sendMeshOverlap, recvMeshOverlap,