[cig-commits] r19528 - short/3D/PyLith/trunk/libsrc/pylith/faults

[brad at geodynamics.org]

Author: brad
Date: 2012-01-30 20:51:58 -0800 (Mon, 30 Jan 2012)
New Revision: 19528

Modified:
   short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc
Log:
Merge from stable.

Modified: short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc	2012-01-31 04:36:06 UTC (rev 19527)
+++ short/3D/PyLith/trunk/libsrc/pylith/faults/CohesiveTopology.cc	2012-01-31 04:51:58 UTC (rev 19528)
@@ -885,7 +885,7 @@
   SieveMesh::renumbering_type gRenumbering;
 
   if (renumbering.size()) {
-    std::cout << "Using renumbering to construct Fault Overlap" << std::endl;
+    //std::cout << "Using renumbering to construct Fault Overlap" << std::endl;
     const SieveMesh::renumbering_type::const_iterator renumberingEnd =
       renumbering.end();
     for (SieveMesh::renumbering_type::const_iterator r_iter = renumbering.begin();
@@ -894,27 +894,40 @@
       if (fRenumbering.find(r_iter->second) != fRenumbering.end())
         gRenumbering[r_iter->first] = fRenumbering[r_iter->second];
   } else {
-    std::cout << "Using new numbering to construct Fault Overlap" << std::endl;
+    //std::cout << "Using new numbering to construct Fault Overlap" << std::endl;
     const SieveMesh::sieve_type::chart_type& chart = sieveMesh->getSieve()->getChart();
     const ALE::Obj<SieveMesh::numbering_type>& globalNumbering = 
       sieveMesh->getFactory()->getNumbering(sieveMesh, -1);
     assert(!globalNumbering.isNull());
-
     for(SieveMesh::point_type p = chart.min(); p < chart.max(); ++p) {
       if (fRenumbering.find(p) != fRenumbering.end()) {
         gRenumbering[globalNumbering->getIndex(p)] = fRenumbering[p];
-      }
-    }
-  }
+      } // if
+    } // for
+  } // if/else
 
   ALE::SetFromMap<SieveMesh::renumbering_type> globalPoints(gRenumbering);
   ALE::OverlapBuilder<>::constructOverlap(globalPoints, gRenumbering,
 					  sendParallelMeshOverlap,
 					  recvParallelMeshOverlap);
   faultSieveMesh->setCalculatedOverlap(true);
-  //sendParallelMeshOverlap->view("Send parallel fault overlap");
-  //recvParallelMeshOverlap->view("Recv parallel fault overlap");
 
+#if 0 // Seems to break unit tests.
+  // Consistency check for parallel overlap.
+  if (fRenumbering.size() > 0) {
+    if (renumbering.size() <= 0 ||
+	gRenumbering.size() <= 0) {
+      throw std::logic_error("Inconsistent data when computing overlap for "
+			     "parallel fault mesh.");
+    } // if
+  } // if
+#endif
+  
+#if 0 // DEBUGGING
+  sendParallelMeshOverlap->view("Send parallel fault overlap");
+  recvParallelMeshOverlap->view("Recv parallel fault overlap");
+#endif
+
   logger.stagePop();
 } // createFaultParallel