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

[brad at geodynamics.org]

Author: brad
Date: 2007-04-19 14:58:41 -0700 (Thu, 19 Apr 2007)
New Revision: 6612

Modified:
   short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
   short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.hh
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
Log:
Setup to set material-id for cohesive elements (but Matt will do).

Modified: short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc	2007-04-19 21:48:51 UTC (rev 6611)
+++ short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.cc	2007-04-19 21:58:41 UTC (rev 6612)
@@ -21,7 +21,8 @@
 // ----------------------------------------------------------------------
 void
 pylith::faults::CohesiveTopology::create(const ALE::Obj<Mesh>& mesh,
-                     const ALE::Obj<Mesh::int_section_type>& groupField)
+					 const ALE::Obj<Mesh::int_section_type>& groupField,
+					 const int materialId)
 { // create
   typedef std::vector<Mesh::point_type> PointArray;
   typedef ALE::SieveAlg<Mesh> sieveAlg;

Modified: short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.hh
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.hh	2007-04-19 21:48:51 UTC (rev 6611)
+++ short/3D/PyLith/trunk/libsrc/faults/CohesiveTopology.hh	2007-04-19 21:58:41 UTC (rev 6612)
@@ -39,10 +39,12 @@
    * @param mesh Finite-element mesh
    * @param faultVertices Vertices assocated with faces of cells defining 
    *   fault surface
+   * @param materialId Material id for cohesive elements.
    */
   static
   void create(const ALE::Obj<Mesh>& mesh,
-              const ALE::Obj<Mesh::int_section_type>& groupField);
+              const ALE::Obj<Mesh::int_section_type>& groupField,
+	      const int materialId);
 
   // PRIVATE METHODS ////////////////////////////////////////////////////
 private :
@@ -56,7 +58,7 @@
    */
   static
   unsigned int _numFaceVertices(const Mesh::point_type& cell,
-		       const ALE::Obj<Mesh>& mesh);
+				const ALE::Obj<Mesh>& mesh);
 
 }; // class CohesiveTopology
 

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc	2007-04-19 21:48:51 UTC (rev 6611)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesive.cc	2007-04-19 21:58:41 UTC (rev 6612)
@@ -54,7 +54,7 @@
     (*mesh)->getIntSection(label());
   assert(!groupField.isNull());
 
-  CohesiveTopology::create(*mesh, groupField);
+  CohesiveTopology::create(*mesh, groupField, id());
 } // adjustTopology
 
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc	2007-04-19 21:48:51 UTC (rev 6611)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc	2007-04-19 21:58:41 UTC (rev 6612)
@@ -87,7 +87,7 @@
   iohandler.read(&mesh);
 
   FaultCohesiveKin fault;
-  fault.id(0);
+  fault.id(1);
   fault.label("fault");
   fault.adjustTopology(&mesh);