[cig-commits] r16176 - in short/3D/PyLith/trunk/unittests/libtests/faults: . data

brad at geodynamics.org brad at geodynamics.org
Mon Jan 25 17:13:33 PST 2010


Author: brad
Date: 2010-01-25 17:13:30 -0800 (Mon, 25 Jan 2010)
New Revision: 16176

Modified:
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh
Log:
Cleanup of variable names.

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -248,7 +248,7 @@
     //residual.view("RESIDUAL"); // DEBUGGING
 
     // Check values
-    const double* valsE = _data->valsResidual;
+    const double* valsE = _data->residual;
     iVertex = 0;
     const int fiberDimE = spaceDim;
     const double tolerance = 1.0e-06;
@@ -279,7 +279,7 @@
     //residual.view("RESIDUAL"); // DEBUGGING
 
     // Check values
-    const double* valsE = _data->valsResidualIncr;
+    const double* valsE = _data->residualIncr;
     iVertex = 0;
     const int fiberDimE = spaceDim;
     const double tolerance = 1.0e-06;
@@ -340,7 +340,7 @@
 
   //MatView(jacobian, PETSC_VIEWER_STDOUT_WORLD); // DEBUGGING
 
-  const double* valsE = _data->valsJacobian;
+  const double* valsE = _data->jacobian;
   const int nrowsE = dispSection->sizeWithBC();
   const int ncolsE = nrowsE;
 
@@ -423,7 +423,7 @@
     //residual->view("RESIDUAL"); // DEBUGGING
 
     // Check values
-    const double* valsE = _data->valsResidual;
+    const double* valsE = _data->residual;
     iVertex = 0;
     const int fiberDimE = spaceDim;
     const double tolerance = 1.0e-06;
@@ -461,7 +461,7 @@
     //residual->view("RESIDUAL"); // DEBUGGING
 
     // Check values
-    const double* valsE = _data->valsResidualIncr;
+    const double* valsE = _data->residualIncr;
     iVertex = 0;
     const int fiberDimE = spaceDim;
     const double tolerance = 1.0e-06;
@@ -528,7 +528,7 @@
 
   // MatView(jacobian.matrix(), PETSC_VIEWER_STDOUT_WORLD); // DEBUGGING
 
-  const double* valsE = _data->valsJacobian;
+  const double* valsE = _data->jacobian;
   const int nrowsE = dispSection->sizeWithBC();
   const int ncolsE = nrowsE;
 
@@ -647,6 +647,106 @@
 } // testIntegrateJacobianAssembledLumped
 
 // ----------------------------------------------------------------------
+// Test adjustSolnLumped().
+void
+pylith::faults::TestFaultCohesiveKin::testAdjustSolnLumped(void)
+{ // testAdjustSolnLumped
+  topology::Mesh mesh;
+  FaultCohesiveKin fault;
+  topology::SolutionFields fields(mesh);
+  _initialize(&mesh, &fault, &fields);
+
+#if 0
+  const int spaceDim = _data->spaceDim;
+  const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
+  CPPUNIT_ASSERT(!sieveMesh.isNull());
+  const ALE::Obj<SieveMesh::label_sequence>& vertices =
+    sieveMesh->depthStratum(0);
+  CPPUNIT_ASSERT(!vertices.isNull());
+  const SieveMesh::label_sequence::iterator verticesBegin = vertices->begin();
+  const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
+
+  { // setup disp
+    const ALE::Obj<RealSection>& dispTSection = fields.get("disp(t)").section();
+    CPPUNIT_ASSERT(!dispTSection.isNull());
+    int iVertex = 0;
+    for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+        v_iter != verticesEnd;
+        ++v_iter, ++iVertex) {
+        dispTSection->updatePoint(*v_iter, &_data->fieldT[iVertex*spaceDim]);
+    } // for
+  } // setup disp
+
+  { // setup residual
+    const ALE::Obj<RealSection>& resisualSection = fields.get("residual").section();
+    CPPUNIT_ASSERT(!residualSection.isNull());
+    int iVertex = 0;
+    for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+        v_iter != verticesEnd;
+        ++v_iter, ++iVertex) {
+        residualSection->updatePoint(*v_iter, &_data->residualE[iVertex*spaceDim]);
+    } // for
+  } // setup residual
+
+  // Set Jacobian values
+  topology::Field<topology::Mesh> jacobian(mesh);
+  jacobian.label("Jacobian");
+  jacobian.vectorFieldType(topology::FieldBase::VECTOR);
+  jacobian.newSection(topology::FieldBase::VERTICES_FIELD, _data->spaceDim);
+  jacobian.allocate();
+  { // setup disp
+    const ALE::Obj<RealSection>& jacobianSection = jacobian.section();
+    CPPUNIT_ASSERT(!jacobianSection.isNull());
+    int iVertex = 0;
+    for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+        v_iter != verticesEnd;
+        ++v_iter, ++iVertex) {
+        jacobianSection->updatePoint(*v_iter, &_data->jacobianLumped[iVertex*spaceDim]);
+    } // for
+  } // setup disp
+  jacobian.complete();
+
+  fault.adjustSolnLumped(&fields, jacobian);
+
+  const topology::Field<topology::Mesh>& solution = fields->get("dispIncr(t->t+dt)");
+#if 0 // DEBUGGING
+  solution.view("ADJUSTED SOLUTION");
+#endif // DEBUGGING
+
+  const ALE::Obj<RealSection>& solutionSection = solution.section();
+  CPPUNIT_ASSERT(!solutionSection.isNull());
+
+  int iVertex = 0;
+  const double tolerance = 1.0e-06;
+  const int spaceDim = _data->spaceDim;
+  const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
+  CPPUNIT_ASSERT(!sieveMesh.isNull());
+  const ALE::Obj<SieveMesh::label_sequence>& vertices =
+    sieveMesh->depthStratum(0);
+  CPPUNIT_ASSERT(!vertices.isNull());
+  const SieveMesh::label_sequence::iterator verticesBegin =
+    vertices->begin();
+  const SieveMesh::label_sequence::iterator verticesEnd = vertices->end();
+
+  const double* solutionE = _data->fieldIncrAdjustedE;
+  for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+       v_iter != verticesEnd;
+       ++v_iter, ++iVertex) {
+    const int fiberDim = solutionSection->getFiberDimension(*v_iter);
+    CPPUNIT_ASSERT_EQUAL(spaceDim, fiberDim);
+    const double* solutionVertex = solutionSection->restrictPoint(*v_iter);
+    CPPUNIT_ASSERT(0 != solutionVertex);
+    for (int iDim=0; iDim < spaceDim; ++iDim)
+      if (0.0 != solutionE[index])
+        CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, solutionVertex[iDim]/solutionE[index],
+          tolerance);
+      else
+        CPPUNIT_ASSERT_DOUBLES_EQUAL(solutionE[index], solutionVertex[iDim], tolerance);
+  } // for
+#endif
+} // testAdjustSolnLumped
+
+// ----------------------------------------------------------------------
 // Test updateStateVars().
 void
 pylith::faults::TestFaultCohesiveKin::testUpdateStateVars(void)

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -104,6 +104,9 @@
   /// Test integrateJacobianAssembled() with lumped Jacobian.
   void testIntegrateJacobianAssembledLumped(void);
 
+  /// Test adjustSolnLumped().
+  void testAdjustSolnLumped(void);
+
   /// Test updateStateVars().
   void testUpdateStateVars(void);
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -41,7 +41,6 @@
   fieldIncrOpenE(0),
   slipOpenE(0),
   constraintVertices(0),
-  constraintCells(0),
   numConstraintVert(0)
 { // constructor
 } // constructor

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLData.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -76,7 +76,6 @@
   double* slipOpenE; ///< Expected values for slip for opening case.
 
   int* constraintVertices; ///< Expected points for constraint vertices
-  int* constraintCells; ///< Expected cells for constraint vertices
   int numConstraintVert; ///< Number of constraint vertices
   //@}
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -1351,10 +1351,6 @@
 const int pylith::faults::CohesiveDynLDataHex8::_constraintVertices[] = {
   18, 19, 20, 21
 };
-const int pylith::faults::CohesiveDynLDataHex8::_constraintCells[] = {
-  23, 23, 23, 23
-};
-
 // ----------------------------------------------------------------------
 // Stick case
 // ----------------------------------------------------------------------
@@ -1527,7 +1523,6 @@
   initialTractions = const_cast<double*>(_initialTractions);
 
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
   numConstraintVert = _numConstraintVert;  
 
   // Stick

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataHex8.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -67,7 +67,6 @@
   static const double _fieldIncrOpenE[]; ///< Expected values for solution increment for opening case.
   static const double _slipOpenE[]; ///< Expected values for slip for opening case.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -326,9 +326,6 @@
 const int pylith::faults::CohesiveDynLDataQuad4::_constraintVertices[] = {
   10, 11
 };
-const int pylith::faults::CohesiveDynLDataQuad4::_constraintCells[] = {
-  13, 13
-};
 
 // ----------------------------------------------------------------------
 // Stick case
@@ -448,7 +445,6 @@
   initialTractions = const_cast<double*>(_initialTractions);
 
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
   numConstraintVert = _numConstraintVert;  
 
   // Stick

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataQuad4.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -67,7 +67,6 @@
   static const double _fieldIncrOpenE[]; ///< Expected values for solution increment for opening case.
   static const double _slipOpenE[]; ///< Expected values for slip for opening case.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -481,9 +481,6 @@
 const int pylith::faults::CohesiveDynLDataTet4::_constraintVertices[] = {
   10, 11, 12
 };
-const int pylith::faults::CohesiveDynLDataTet4::_constraintCells[] = {
-  14, 14, 14
-};
 
 // ----------------------------------------------------------------------
 // Stick case
@@ -610,7 +607,6 @@
   initialTractions = const_cast<double*>(_initialTractions);
 
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
   numConstraintVert = _numConstraintVert;  
 
   // Stick

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTet4.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -67,7 +67,6 @@
   static const double _fieldIncrOpenE[]; ///< Expected values for solution increment for opening case.
   static const double _slipOpenE[]; ///< Expected values for slip for opening case.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -256,9 +256,6 @@
 const int pylith::faults::CohesiveDynLDataTri3::_constraintVertices[] = {
   8, 9
 };
-const int pylith::faults::CohesiveDynLDataTri3::_constraintCells[] = {
-  11, 11
-};
 
 // ----------------------------------------------------------------------
 // Stick case
@@ -368,7 +365,6 @@
   initialTractions = const_cast<double*>(_initialTractions);
 
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
   numConstraintVert = _numConstraintVert;  
 
   // Stick

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -67,7 +67,6 @@
   static const double _fieldIncrOpenE[]; ///< Expected values for solution increment for opening case.
   static const double _slipOpenE[]; ///< Expected values for slip for opening case.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -35,10 +35,9 @@
   orientation(0),
   area(0),
   constraintVertices(0),
-  constraintCells(0),
-  valsResidual(0),
-  valsResidualIncr(0),
-  valsJacobian(0),
+  residual(0),
+  residualIncr(0),
+  jacobian(0),
   numConstraintVert(0)
 { // constructor
 } // constructor

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinData.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -61,21 +61,23 @@
 
   /// @name Input fields
   //@{
-  double* fieldT; ///< Solution field at time t.
+  double* fieldT; ///< Field over domain at time t.
+  double* fieldIncr; ///< Solution increment field over domain at time t.
+  double* jacobianLumped; ///< Lumped Jacobian.
   //@}
 
   /// @name Calculated values.
   //@{
   double* orientation; ///< Expected values for fault orientation.
   double* area; ///< Expected values for fault area.
-  int* constraintVertices; ///< Expected points for constraint vertices
-  int* constraintCells; ///< Expected cells for constraint vertices
-  double* valsResidual; ///< Expected values from residual calculation.
+  double* residual; ///< Expected values from residual calculation.
 
   /// Expected values from residual calculation using solution increment.
-  double* valsResidualIncr;
+  double* residualIncr;
 
-  double* valsJacobian; ///< Expected values from Jacobian calculation.
+  double* jacobian; ///< Expected values from Jacobian calculation.
+
+  int* constraintVertices; ///< Expected points for constraint vertices
   int numConstraintVert; ///< Number of constraint vertices
   //@}
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -144,11 +144,8 @@
   18, 19, 20, 21
 };
 
-const int pylith::faults::CohesiveKinDataHex8::_constraintCells[] = {
-  23, 23, 23, 23
-};
 
-const double pylith::faults::CohesiveKinDataHex8::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataHex8::_residual[] = {
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -171,7 +168,7 @@
   1.1, 1.1, 1.1, // 21 (constraint)
 };
 
-const double pylith::faults::CohesiveKinDataHex8::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataHex8::_residualIncr[] = {
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -194,7 +191,7 @@
   1.1, 1.1, 1.1, // 21 (constraint)
 };
 
-const double pylith::faults::CohesiveKinDataHex8::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataHex8::_jacobian[] = {
   0.0, 0.0, 0.0, // 2x
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -1419,10 +1416,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataHex8.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -92,11 +92,8 @@
   6
 };
 
-const int pylith::faults::CohesiveKinDataLine2::_constraintCells[] = {
-  8
-};
 
-const double pylith::faults::CohesiveKinDataLine2::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataLine2::_residualIncr[] = {
    0.0,
    7.5,
    0.0,
@@ -104,7 +101,7 @@
   -0.2,
 };
 
-const double pylith::faults::CohesiveKinDataLine2::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataLine2::_residual[] = {
    0.0,
    7.5,
    0.0,
@@ -112,7 +109,7 @@
   -0.2,
 };
 
-const double pylith::faults::CohesiveKinDataLine2::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataLine2::_jacobian[] = {
   0.0,  0.0,  0.0,  0.0,  0.0,
   0.0,  0.0,  0.0,  0.0, -1.0,
   0.0,  0.0,  0.0,  0.0,  0.0,
@@ -142,10 +139,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residualIncr = const_cast<double*>(_residualIncr);
+  residual = const_cast<double*>(_residual);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation with solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation with solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -121,11 +121,8 @@
   10, 11
 };
 
-const int pylith::faults::CohesiveKinDataQuad4::_constraintCells[] = {
-  13, 13
-};
 
-const double pylith::faults::CohesiveKinDataQuad4::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataQuad4::_residual[] = {
   0.0,  0.0,
   0.0,  0.0,
   9.8,  8.8, // 4
@@ -138,7 +135,7 @@
  -0.5, -0.5, // 11
 };
 
-const double pylith::faults::CohesiveKinDataQuad4::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataQuad4::_residualIncr[] = {
   0.0,  0.0,
   0.0,  0.0,
   9.8,  8.8, // 4
@@ -151,7 +148,7 @@
  -0.5, -0.5, // 11
 };
 
-const double pylith::faults::CohesiveKinDataQuad4::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataQuad4::_jacobian[] = {
   0.0, 0.0, // 2x
   0.0, 0.0,
   0.0, 0.0,
@@ -376,10 +373,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -148,11 +148,7 @@
   16, 17, 18
 };
 
-const int pylith::faults::CohesiveKinDataQuad4e::_constraintCells[] = {
-  21, 21, 22
-};
-
-const double pylith::faults::CohesiveKinDataQuad4e::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataQuad4e::_residual[] = {
   0.0,  0.0,
   0.0,  0.0,
  -6.1, -4.1, // 6
@@ -170,7 +166,7 @@
   0.6,  0.6, // 18
 };
 
-const double pylith::faults::CohesiveKinDataQuad4e::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataQuad4e::_residualIncr[] = {
   0.0,  0.0,
   0.0,  0.0,
  -6.1, -4.1, // 6
@@ -188,7 +184,7 @@
   0.6,  0.6, // 18
 };
 
-const double pylith::faults::CohesiveKinDataQuad4e::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataQuad4e::_jacobian[] = {
   0.0, 0.0, // 4x
   0.0, 0.0,
   0.0, 0.0,
@@ -663,10 +659,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataQuad4e.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -112,11 +112,7 @@
   10, 11, 12
 };
 
-const int pylith::faults::CohesiveKinDataTet4::_constraintCells[] = {
-  14, 14, 14
-};
-
-const double pylith::faults::CohesiveKinDataTet4::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataTet4::_residual[] = {
   0.0,  0.0,  0.0,
   9.7,  7.7,  8.7, // 3
   9.9,  7.9,  8.9, // 4
@@ -130,7 +126,7 @@
   0.4,  0.4,  0.4, // 12
 };
 
-const double pylith::faults::CohesiveKinDataTet4::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataTet4::_residualIncr[] = {
   0.0,  0.0,  0.0,
   9.7,  7.7,  8.7, // 3
   9.9,  7.9,  8.9, // 4
@@ -144,7 +140,7 @@
   0.4,  0.4,  0.4, // 12
 };
 
-const double pylith::faults::CohesiveKinDataTet4::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataTet4::_jacobian[] = {
   0.0, 0.0, 0.0, // 2x
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -532,10 +528,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -117,11 +117,7 @@
   14, 15, 16, 17
 };
 
-const int pylith::faults::CohesiveKinDataTet4e::_constraintCells[] = {
-  20, 20, 20, 21
-};
-
-const double pylith::faults::CohesiveKinDataTet4e::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataTet4e::_residual[] = {
   0.0,  0.0,  0.0,
   7.8,  3.8,  5.8, // 5
   7.0,  3.0,  5.0, // 6
@@ -138,7 +134,7 @@
  -0.8, -0.8, -0.8, // 17
 };
 
-const double pylith::faults::CohesiveKinDataTet4e::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataTet4e::_residualIncr[] = {
   0.0,  0.0,  0.0,
   7.8,  3.8,  5.8, // 5
   7.0,  3.0,  5.0, // 6
@@ -155,7 +151,7 @@
  -0.8, -0.8, -0.8, // 17
 };
 
-const double pylith::faults::CohesiveKinDataTet4e::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataTet4e::_jacobian[] = {
   0.0, 0.0, 0.0, // 4x
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -768,10 +764,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4e.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -112,11 +112,7 @@
   10, 11, 12
 };
 
-const int pylith::faults::CohesiveKinDataTet4f::_constraintCells[] = {
-  14, 14, 14
-};
-
-const double pylith::faults::CohesiveKinDataTet4f::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataTet4f::_residual[] = {
   0.0,  0.0,  0.0,
  -9.7, -7.7, -8.7, // 3
  -9.9, -7.9, -8.9, // 4
@@ -130,7 +126,7 @@
  -0.4, -0.4, -0.4, // 12
 };
 
-const double pylith::faults::CohesiveKinDataTet4f::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataTet4f::_residualIncr[] = {
   0.0,  0.0,  0.0,
  -9.7, -7.7, -8.7, // 3
  -9.9, -7.9, -8.9, // 4
@@ -144,7 +140,7 @@
  -0.4, -0.4, -0.4, // 12
 };
 
-const double pylith::faults::CohesiveKinDataTet4f::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataTet4f::_jacobian[] = {
   0.0, 0.0, 0.0, // 2x
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -532,10 +528,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTet4f.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -122,11 +122,7 @@
   8, 9
 };
 
-const int pylith::faults::CohesiveKinDataTri3::_constraintCells[] = {
-  11, 11
-};
-
-const double pylith::faults::CohesiveKinDataTri3::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataTri3::_residual[] = {
   0.0,  0.0,
  -9.6, -8.6, // 3
  -9.8, -8.8, // 4
@@ -137,7 +133,7 @@
   0.4,  0.4, // 9
 };
 
-const double pylith::faults::CohesiveKinDataTri3::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataTri3::_residualIncr[] = {
   0.0,  0.0,
  -9.6, -8.6, // 3
  -9.8, -8.8, // 4
@@ -148,7 +144,7 @@
   0.4,  0.4, // 9
 };
 
-const double pylith::faults::CohesiveKinDataTri3::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataTri3::_jacobian[] = {
   0.0, 0.0, // 2x
   0.0, 0.0,
   0.0, 0.0,
@@ -303,10 +299,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -144,11 +144,7 @@
   13, 14, 15
 };
 
-const int pylith::faults::CohesiveKinDataTri3d::_constraintCells[] = {
-  18, 18, 19
-};
-
-const double pylith::faults::CohesiveKinDataTri3d::_valsResidual[] = {
+const double pylith::faults::CohesiveKinDataTri3d::_residual[] = {
   0.0,  0.0,
  -1.4142135623730949, -11.030865786510143, // 5
  -8.0,  -6.0, // 6
@@ -163,7 +159,7 @@
  -0.6, 0.6, // 15
 };
 
-const double pylith::faults::CohesiveKinDataTri3d::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinDataTri3d::_residualIncr[] = {
   0.0,  0.0,
  -1.4142135623730949, -11.030865786510143, // 5
  -8.0,  -6.0, // 6
@@ -178,7 +174,7 @@
  -0.6, 0.6, // 15
 };
 
-const double pylith::faults::CohesiveKinDataTri3d::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinDataTri3d::_jacobian[] = {
   0.0, 0.0, // 4x
   0.0, 0.0,
   0.0, 0.0,
@@ -491,10 +487,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3d.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -144,11 +144,7 @@
   18, 19, 20, 21
 };
 
-const int pylith::faults::CohesiveKinSrcsDataHex8::_constraintCells[] = {
-  23, 23, 23, 23
-};
-
-const double pylith::faults::CohesiveKinSrcsDataHex8::_valsResidual[] = {
+const double pylith::faults::CohesiveKinSrcsDataHex8::_residual[] = {
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -171,7 +167,7 @@
   1.1, 1.1, 1.1, // 21 (constraint)
 };
 
-const double pylith::faults::CohesiveKinSrcsDataHex8::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinSrcsDataHex8::_residualIncr[] = {
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -194,7 +190,7 @@
   1.1, 1.1, 1.1, // 21 (constraint)
 };
 
-const double pylith::faults::CohesiveKinSrcsDataHex8::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinSrcsDataHex8::_jacobian[] = {
   0.0, 0.0, 0.0, // 2x
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -1419,10 +1415,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataHex8.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -92,11 +92,7 @@
   6
 };
 
-const int pylith::faults::CohesiveKinSrcsDataLine2::_constraintCells[] = {
-  8
-};
-
-const double pylith::faults::CohesiveKinSrcsDataLine2::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinSrcsDataLine2::_residualIncr[] = {
    0.0,
    7.5,
    0.0,
@@ -104,7 +100,7 @@
   -0.2
 };
 
-const double pylith::faults::CohesiveKinSrcsDataLine2::_valsResidual[] = {
+const double pylith::faults::CohesiveKinSrcsDataLine2::_residual[] = {
    0.0,
    7.5,
    0.0,
@@ -112,7 +108,7 @@
   -0.2
 };
 
-const double pylith::faults::CohesiveKinSrcsDataLine2::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinSrcsDataLine2::_jacobian[] = {
   0.0,  0.0,  0.0,  0.0,  0.0,
   0.0,  0.0,  0.0,  0.0, -1.0,
   0.0,  0.0,  0.0,  0.0,  0.0,
@@ -142,10 +138,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residualIncr = const_cast<double*>(_residualIncr);
+  residual = const_cast<double*>(_residual);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataLine2.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation with solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation with solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -121,11 +121,7 @@
   10, 11
 };
 
-const int pylith::faults::CohesiveKinSrcsDataQuad4::_constraintCells[] = {
-  13, 13
-};
-
-const double pylith::faults::CohesiveKinSrcsDataQuad4::_valsResidual[] = {
+const double pylith::faults::CohesiveKinSrcsDataQuad4::_residual[] = {
   0.0,  0.0,
   0.0,  0.0,
   9.8,  8.8, // 4
@@ -138,7 +134,7 @@
  -0.5, -0.5, // 11
 };
 
-const double pylith::faults::CohesiveKinSrcsDataQuad4::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinSrcsDataQuad4::_residualIncr[] = {
   0.0,  0.0,
   0.0,  0.0,
   9.8,  8.8, // 4
@@ -151,7 +147,7 @@
  -0.5, -0.5, // 11
 };
 
-const double pylith::faults::CohesiveKinSrcsDataQuad4::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinSrcsDataQuad4::_jacobian[] = {
   0.0, 0.0, // 2x
   0.0, 0.0,
   0.0, 0.0,
@@ -376,10 +372,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataQuad4.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -112,11 +112,7 @@
   10, 11, 12
 };
 
-const int pylith::faults::CohesiveKinSrcsDataTet4::_constraintCells[] = {
-  14, 14, 14
-};
-
-const double pylith::faults::CohesiveKinSrcsDataTet4::_valsResidual[] = {
+const double pylith::faults::CohesiveKinSrcsDataTet4::_residual[] = {
   0.0,  0.0,  0.0,
   9.7,  7.7,  8.7, // 3
   9.9,  7.9,  8.9, // 4
@@ -130,7 +126,7 @@
   0.4,  0.4,  0.4, // 12
 };
 
-const double pylith::faults::CohesiveKinSrcsDataTet4::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinSrcsDataTet4::_residualIncr[] = {
   0.0,  0.0,  0.0,
   9.7,  7.7,  8.7, // 3
   9.9,  7.9,  8.9, // 4
@@ -144,7 +140,7 @@
   0.4,  0.4,  0.4, // 12
 };
 
-const double pylith::faults::CohesiveKinSrcsDataTet4::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinSrcsDataTet4::_jacobian[] = {
   0.0, 0.0, 0.0, // 2x
   0.0, 0.0, 0.0,
   0.0, 0.0, 0.0,
@@ -532,10 +528,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTet4.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.cc	2010-01-26 01:13:30 UTC (rev 16176)
@@ -133,11 +133,7 @@
   8, 9
 };
 
-const int pylith::faults::CohesiveKinSrcsDataTri3::_constraintCells[] = {
-  11, 11
-};
-
-const double pylith::faults::CohesiveKinSrcsDataTri3::_valsResidual[] = {
+const double pylith::faults::CohesiveKinSrcsDataTri3::_residual[] = {
   0.0,  0.0,
  -9.6, -8.6, // 3
  -9.8, -8.8, // 4
@@ -148,7 +144,7 @@
   0.4,  0.4, // 9
 };
 
-const double pylith::faults::CohesiveKinSrcsDataTri3::_valsResidualIncr[] = {
+const double pylith::faults::CohesiveKinSrcsDataTri3::_residualIncr[] = {
   0.0,  0.0,
  -9.6, -8.6, // 3
  -9.8, -8.8, // 4
@@ -159,7 +155,7 @@
   0.4,  0.4, // 9
 };
 
-const double pylith::faults::CohesiveKinSrcsDataTri3::_valsJacobian[] = {
+const double pylith::faults::CohesiveKinSrcsDataTri3::_jacobian[] = {
   0.0, 0.0, // 2x
   0.0, 0.0,
   0.0, 0.0,
@@ -314,10 +310,9 @@
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
   constraintVertices = const_cast<int*>(_constraintVertices);
-  constraintCells = const_cast<int*>(_constraintCells);
-  valsResidual = const_cast<double*>(_valsResidual);
-  valsResidualIncr = const_cast<double*>(_valsResidualIncr);
-  valsJacobian = const_cast<double*>(_valsJacobian);
+  residual = const_cast<double*>(_residual);
+  residualIncr = const_cast<double*>(_residualIncr);
+  jacobian = const_cast<double*>(_jacobian);
   numConstraintVert = _numConstraintVert;  
 } // constructor
 

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh	2010-01-25 23:25:27 UTC (rev 16175)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinSrcsDataTri3.hh	2010-01-26 01:13:30 UTC (rev 16176)
@@ -62,10 +62,9 @@
   static const double _orientation[]; ///< Expected values for fault orientation.
   static const double _area[]; ///< Expected values for fault area.
   static const int _constraintVertices[]; ///< Expected points for constraint vertices
-  static const int _constraintCells[]; ///< Expected cells for constraint vertices
-  static const double _valsResidual[]; ///< Expected values from residual calculation.
-  static const double _valsResidualIncr[]; ///< Expected values from residual calculation using solution increment.
-  static const double _valsJacobian[]; ///< Expected values from Jacobian calculation.
+  static const double _residual[]; ///< Expected values from residual calculation.
+  static const double _residualIncr[]; ///< Expected values from residual calculation using solution increment.
+  static const double _jacobian[]; ///< Expected values from Jacobian calculation.
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };



More information about the CIG-COMMITS mailing list