[cig-commits] r6589 - in short/3D/PyLith/trunk: libsrc/faults playpen/cohesive/src

[knepley at geodynamics.org]

Author: knepley
Date: 2007-04-17 11:11:36 -0700 (Tue, 17 Apr 2007)
New Revision: 6589

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
   short/3D/PyLith/trunk/playpen/cohesive/src/testcohesive.cc
Log:
More work on faults


Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc	2007-04-17 18:10:57 UTC (rev 6588)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc	2007-04-17 18:11:36 UTC (rev 6589)
@@ -54,15 +54,6 @@
     (*mesh)->getIntSection(label());
   assert(!groupField.isNull());
   const int_section_type::chart_type& chart = groupField->getChart();
-  const Mesh::point_type firstPoint = *chart.begin();
-  ALE::Obj<Mesh::numbering_type> numbering;
-  if ((*mesh)->height(firstPoint) == 0) {
-    std::ostringstream msg;
-    msg << "Group associated with fault '" << label() << "' must contain "
-	<< "vertices, not cells.";
-    throw std::runtime_error(msg.str());
-  } else
-    numbering = (*mesh)->getFactory()->getNumbering(*mesh, 0);
 
   // Create set with vertices on fault
   std::set<Mesh::point_type> points; // Vertices on fault
@@ -70,8 +61,8 @@
   for(int_section_type::chart_type::iterator c_iter = chart.begin();
       c_iter != chart.end();
       ++c_iter) {
-    assert(!numbering.isNull());
-    points.insert(numbering->getIndex(*c_iter)+numCells);
+    assert(!(*mesh)->depth(*c_iter));
+    points.insert(*c_iter);
   } // for
   CohesiveTopology::create(*mesh, points);
 } // adjustTopology

Modified: short/3D/PyLith/trunk/playpen/cohesive/src/testcohesive.cc
===================================================================
--- short/3D/PyLith/trunk/playpen/cohesive/src/testcohesive.cc	2007-04-17 18:10:57 UTC (rev 6588)
+++ short/3D/PyLith/trunk/playpen/cohesive/src/testcohesive.cc	2007-04-17 18:11:36 UTC (rev 6589)
@@ -18,7 +18,7 @@
   } // if
 
   try {
-    typedef ALE::Field::Mesh Mesh;
+    typedef ALE::Mesh Mesh;
     ALE::Obj<Mesh> mesh;
 
     pylith::meshio::MeshIOAscii iohandler;