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

[brad at geodynamics.org]

Author: brad
Date: 2010-01-26 17:44:00 -0800 (Tue, 26 Jan 2010)
New Revision: 16186

Added:
   short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py
Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py
Log:
More work on unit tests for adjusting lumped solution.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2010-01-27 00:25:53 UTC (rev 16185)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2010-01-27 01:44:00 UTC (rev 16186)
@@ -903,6 +903,11 @@
 	  // dl_k = D^{-1}( C_{ki} Aru - d_k)
 	  const double Aruslip = Aru - slipVertex[0];
 	  const double dlp = dinv00*Aruslip;
+	  std::cout << "Aru: " << Aru
+		    << ", Aruslip: " << Aruslip
+		    << ", dinv00: " << dinv00
+		    << ", dlp: " << dlp
+		    << std::endl;
 
 	  // Update displacements at node I
 	  solutionCell[indexI*spaceDim+0] =  wt * -1.0/Ai[0] * dlp;

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc	2010-01-27 00:25:53 UTC (rev 16185)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataLine2.cc	2010-01-27 01:44:00 UTC (rev 16186)
@@ -72,26 +72,26 @@
 // Don't expect these values to be used, so just use some values.
 const double pylith::faults::CohesiveKinDataLine2::_fieldT[] = {
   7.1,
-  7.2,
+  7.2, // 3
   7.3,
-  7.4,
+  7.4, // 5
   7.5
 };
 
 const double pylith::faults::CohesiveKinDataLine2::_fieldIncr[] = {
   1.1,
-  1.2,
+  1.2, // 3
   1.3,
-  1.4,
+  1.4, // 5
   1.5
 };
 
 const double pylith::faults::CohesiveKinDataLine2::_jacobianLumped[] = {
   2.1,
-  2.2,
+  2.2, // 3
   2.3,
-  2.4,
-  2.5
+  2.4, // 5
+  1.0
 };
 
 const int pylith::faults::CohesiveKinDataLine2::_numConstraintVert = 1;
@@ -119,9 +119,9 @@
 
 const double pylith::faults::CohesiveKinDataLine2::_residual[] = {
    0.0,
-   7.5,
+   7.5, // 3
    0.0,
-  -7.5,
+   -7.5, // 5
   -0.2,
 };
 

Added: short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py	                        (rev 0)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py	2010-01-27 01:44:00 UTC (rev 16186)
@@ -0,0 +1,15 @@
+# Line2
+C = 1.0
+dk = 1.89546413727; dl = 1.5
+Ai = 2.2; ri = 7.5; ui = 7.2; dui = 1.2
+Aj = 2.4; rj = -7.5; uj = 7.4; duj = 1.4
+
+Si = (Ai * Aj) / (Ai + Aj)
+ddl = Si * (C*(ri/Ai - rj/Aj + ui - uj) - dk)
+
+ddui = -C / Ai * ddl
+dduj = +C / Aj * ddl
+
+print ddl
+print ddui
+print dui+ddui,duj+dduj,dl+ddl

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py	2010-01-27 00:25:53 UTC (rev 16185)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py	2010-01-27 01:44:00 UTC (rev 16186)
@@ -1,14 +1,16 @@
 from math import *
 
-finalSlip = (2.6, -1.0, 0.4)
+finalSlip = (2.3, 0.0, 0.0)
+riseTime = 1.4
 
 slipMag = (finalSlip[0]**2+finalSlip[1]**2+finalSlip[2]**2)**0.5
-peakRate = 1.8
-slipTime1 = 1.5+0.5
+
+slipTime1 = 1.2
 slipTime2 = 1.5
 t = 2.134
 dt = 0.01
 
+peakRate = slipMag / riseTime * 1.745;
 tau = slipMag / (exp(1.0) * peakRate)
 
 t0 = slipTime1
@@ -25,7 +27,7 @@
 slipNincr = slipNincr1 + slipNincr2
 
 print "%13.11f, %13.11f, %13.11f" % \
-      (slipN*finalSlip[0], slipN*finalSlip[1], slipN*finalSlip[2])
+      (slipN1*finalSlip[0], slipN1*finalSlip[1], slipN1*finalSlip[2])
 
 print "%13.11f, %13.11f, %13.11f" % \
       (slipNincr*finalSlip[0], slipNincr*finalSlip[1], slipNincr*finalSlip[2])