[cig-commits] r6590 - in short/3D/PyLith/trunk: libsrc/faults libsrc/meshio unittests/libtests/faults

[knepley at geodynamics.org]

Author: knepley
Date: 2007-04-17 11:44:39 -0700 (Tue, 17 Apr 2007)
New Revision: 6590

Modified:
   short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
   short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
Log:
More of fault test working


Modified: short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc	2007-04-17 18:11:36 UTC (rev 6589)
+++ short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc	2007-04-17 18:44:39 UTC (rev 6590)
@@ -35,7 +35,7 @@
     faultVertices.end();
 
   // There should be logic here to determine this
-  int f = 0;
+  int f = sieve->base()->size() + sieve->cap()->size();
   int debug = mesh->debug();
   ALE::Obj<PointArray> face = new PointArray();
   std::set<Mesh::point_type> faultCells;
@@ -109,6 +109,7 @@
       } // if
     } // for
   } // for
+  faultSieve->view("Fault sieve");
   fault->setSieve(faultSieve);
   fault->stratify();
   faultCells.clear();

Modified: short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc	2007-04-17 18:11:36 UTC (rev 6589)
+++ short/3D/PyLith/trunk/libsrc/meshio/MeshIO.cc	2007-04-17 18:44:39 UTC (rev 6590)
@@ -99,7 +99,8 @@
                                          numCells, 
                                          const_cast<int*>(&cells[0]), 
                                          numVertices, 
-                                         _interpolate, numCorners);
+                                         _interpolate, numCorners, -1,
+                                         (*_mesh)->getArrowSection("orientation"));
   (*_mesh)->setSieve(sieve);
   (*_mesh)->stratify();
   ALE::SieveBuilder<Mesh>::buildCoordinates(*_mesh, spaceDim, &coordinates[0]);

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc	2007-04-17 18:11:36 UTC (rev 6589)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc	2007-04-17 18:44:39 UTC (rev 6590)
@@ -44,7 +44,7 @@
   meshio::MeshIOAscii iohandler;
   iohandler.filename(filename);
   iohandler.debug(true);
-  iohandler.interpolate(true);
+  iohandler.interpolate(false);
   iohandler.read(&mesh);
 
   FaultCohesiveKin fault;