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

[brad at geodynamics.org]

Author: brad
Date: 2010-01-25 17:50:25 -0800 (Mon, 25 Jan 2010)
New Revision: 16178

Modified:
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh
Log:
More work on adjustSolnLumped() unit test.

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc	2010-01-26 01:27:01 UTC (rev 16177)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc	2010-01-26 01:50:25 UTC (rev 16178)
@@ -676,6 +676,17 @@
     } // for
   } // setup disp
 
+  { // setup disp increment
+    const ALE::Obj<RealSection>& dispIncrSection = fields.get("dispIncr(t->t+dt)").section();
+    CPPUNIT_ASSERT(!dispIncrSection.isNull());
+    int iVertex = 0;
+    for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
+        v_iter != verticesEnd;
+        ++v_iter, ++iVertex) {
+        dispIncrSection->updatePoint(*v_iter, &_data->fieldIncr[iVertex*spaceDim]);
+    } // for
+  } // setup disp increment
+
   // Set Jacobian values
   topology::Field<topology::Mesh> jacobian(mesh);
   jacobian.label("Jacobian");
@@ -703,11 +714,15 @@
   residual.complete();
   fault.integrateResidualAssembled(residual, t, &fields);
 
+  const topology::Field<topology::Mesh>& solution = fields.get("dispIncr(t->t+dt)");
+#if 1 // DEBUGGING
+  solution.view("SOLUTION BEFORE ADJUSTMENT");
+#endif // DEBUGGING
+
   fault.adjustSolnLumped(&fields, jacobian);
 
-  const topology::Field<topology::Mesh>& solution = fields.get("dispIncr(t->t+dt)");
-#if 0 // DEBUGGING
-  solution.view("ADJUSTED SOLUTION");
+#if 1 // DEBUGGING
+  solution.view("SOLUTION AFTER ADJUSTMENT");
 #endif // DEBUGGING
 
   const ALE::Obj<RealSection>& solutionSection = solution.section();

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh	2010-01-26 01:27:01 UTC (rev 16177)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKinLine2.hh	2010-01-26 01:50:25 UTC (rev 16178)
@@ -42,6 +42,7 @@
   CPPUNIT_TEST( testIntegrateJacobian );
   CPPUNIT_TEST( testIntegrateJacobianAssembled );
   CPPUNIT_TEST( testIntegrateJacobianAssembledLumped );
+  CPPUNIT_TEST( testAdjustSolnLumped );
   CPPUNIT_TEST( testUpdateStateVars );
   CPPUNIT_TEST( testCalcTractionsChange );
   CPPUNIT_TEST( testSplitField );

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc	2010-01-26 01:27:01 UTC (rev 16177)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc	2010-01-26 01:50:25 UTC (rev 16178)
@@ -78,8 +78,29 @@
   7.5
 };
 
+const double pylith::faults::CohesiveKinDataLine2::_fieldIncr[] = {
+  1.1,
+  1.2,
+  1.3,
+  1.4,
+  1.5
+};
+
+const double pylith::faults::CohesiveKinDataLine2::_jacobianLumped[] = {
+  2.1,
+  2.2,
+  2.3,
+  2.4,
+  2.5
+};
+
 const int pylith::faults::CohesiveKinDataLine2::_numConstraintVert = 1;
+const int pylith::faults::CohesiveKinDataLine2::_constraintVertices[] = {
+  6
+};
 
+
+
 const double pylith::faults::CohesiveKinDataLine2::_orientation[] = {
   1.0
 };
@@ -88,11 +109,6 @@
   1.0
 };
 
-const int pylith::faults::CohesiveKinDataLine2::_constraintVertices[] = {
-  6
-};
-
-
 const double pylith::faults::CohesiveKinDataLine2::_residualIncr[] = {
    0.0,
    7.5,
@@ -117,6 +133,14 @@
   0.0, -1.0,  0.0, +1.0,  0.0,
 };
 
+const double pylith::faults::CohesiveKinDataLine2::_fieldIncrAdjusted[] = {
+  1.1,
+  1.2, // 3
+  1.3,
+  1.4, // 5
+  1.5, // 6
+};
+
 pylith::faults::CohesiveKinDataLine2::CohesiveKinDataLine2(void)
 { // constructor
   meshFilename = const_cast<char*>(_meshFilename);
@@ -136,12 +160,15 @@
   riseTimeFilename = const_cast<char*>(_riseTimeFilename);
   matPropsFilename = const_cast<char*>(_matPropsFilename);
   fieldT = const_cast<double*>(_fieldT);
+  fieldIncr = const_cast<double*>(_fieldIncr);
+  jacobianLumped = const_cast<double*>(_jacobianLumped);
   orientation = const_cast<double*>(_orientation);
   area = const_cast<double*>(_area);
-  constraintVertices = const_cast<int*>(_constraintVertices);
   residualIncr = const_cast<double*>(_residualIncr);
   residual = const_cast<double*>(_residual);
   jacobian = const_cast<double*>(_jacobian);
+  fieldIncrAdjusted = const_cast<double*>(_fieldIncrAdjusted);
+  constraintVertices = const_cast<int*>(_constraintVertices);
   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-26 01:27:01 UTC (rev 16177)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.hh	2010-01-26 01:50:25 UTC (rev 16178)
@@ -57,14 +57,17 @@
   static const char* _matPropsFilename; ///< Name of db for bulk mat properties.
   //@}
 
-  static const double _fieldT[]; ///< Solution field at time t.
+  static const double _fieldT[]; ///< Field over domain at time t.
+  static const double _fieldIncr[]; ///< Solution increment field over domain at time t.
+  static const double _jacobianLumped[]; ///< Lumped Jacobian.
 
   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 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 double _fieldIncrAdjusted[]; ///< Expected values for colution increment after adjustment.
+  static const int _constraintVertices[]; ///< Expected points for constraint vertices
   static const int _numConstraintVert; ///< Number of constraint vertices
 
 };