[cig-commits] r16192 - in short/3D/PyLith/trunk/unittests/libtests/faults: . data
brad at geodynamics.org
brad at geodynamics.org
Thu Jan 28 17:23:42 PST 2010
Author: brad
Date: 2010-01-28 17:23:42 -0800 (Thu, 28 Jan 2010)
New Revision: 16192
Modified:
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py
short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py
Log:
Set values for tri3 test of adjustSolnLumped.
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2010-01-28 17:37:35 UTC (rev 16191)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2010-01-29 01:23:42 UTC (rev 16192)
@@ -728,22 +728,23 @@
const ALE::Obj<RealSection>& solutionSection = solution.section();
CPPUNIT_ASSERT(!solutionSection.isNull());
- int iVertex = 0;
+ int i = 0;
const double tolerance = 1.0e-06;
const double* solutionE = _data->fieldIncrAdjusted;
for (SieveMesh::label_sequence::iterator v_iter=verticesBegin;
v_iter != verticesEnd;
- ++v_iter, ++iVertex) {
+ ++v_iter) {
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[iVertex])
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, solutionVertex[iDim]/solutionE[iVertex],
+ for (int iDim=0; iDim < spaceDim; ++iDim, ++i)
+ if (0.0 != solutionE[i])
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, solutionVertex[iDim]/solutionE[i],
tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(solutionE[iVertex], solutionVertex[iDim], tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(solutionE[i], solutionVertex[iDim],
+ tolerance);
} // for
} // testAdjustSolnLumped
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2010-01-28 17:37:35 UTC (rev 16191)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveKinDataTri3.cc 2010-01-29 01:23:42 UTC (rev 16192)
@@ -301,13 +301,13 @@
const double pylith::faults::CohesiveKinDataTri3::_fieldIncrAdjusted[] = {
3.1, 4.1,
- 3.2, 4.2, // 3
- 3.3, 4.3, // 4
+ 11.3208825088, 10.4802977015, // 3
+ 10.9812907996, 10.2898485695, // 4
3.4, 4.4,
- 3.5, 4.5, // 6
- 3.7, 4.7, // 7
- 3.6, 4.6, // 8
- 3.8, 4.8, // 9
+ -2.99670600701, -0.524238161213, // 6
+ -2.17392825851, 0.119527564532, // 7
+ 11.1363572418, 14.3450590105, // 8
+ 11.5868031403, 14.7856780395, // 9
};
pylith::faults::CohesiveKinDataTri3::CohesiveKinDataTri3(void)
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py 2010-01-28 17:37:35 UTC (rev 16191)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/adjustsoln.py 2010-01-29 01:23:42 UTC (rev 16192)
@@ -1,4 +1,5 @@
test = "tri3"
+vertex = 1
# ----------------------------------------------------------------------
if test == "line2":
@@ -25,27 +26,45 @@
# ----------------------------------------------------------------------
elif test == "tri3":
- # Lagrange vertex 8, vertex i: 3, vertex j: 6
Cpx = 0.0
Cpy = -1.0
Cqx = -1.0
Cqy = 0.0
- dkp = 1.89546413727; lp = 1.5
- dkq = 0.08241148423; lq = 1.5
+ if vertex == 0:
+ # Lagrange vertex 8, vertex i: 3, vertex j: 6
+ dkp = 1.89546413727; lp = 3.6
+ dkq = 0.08241148423; lq = 4.6
- # vertex i
- Aix = 1.2; Aiy = 1.2
- rix = -9.6; riy = -8.6
- uix = 8.2; uiy = 9.2
- duix = 3.2; duiy = 4.2
+ # vertex i
+ Aix = 1.2; Aiy = 1.2
+ rix = -9.6; riy = -8.6
+ uix = 8.2; uiy = 9.2
+ duix = 3.2; duiy = 4.2
- # vertex j
- Ajx = 1.5; Ajy = 1.5
- rjx = +9.6; rjy = +8.6
- ujx = 8.5; ujy = 9.5
- dujx = 3.5; dujy = 4.5
+ # vertex j
+ Ajx = 1.5; Ajy = 1.5
+ rjx = +9.6; rjy = +8.6
+ ujx = 8.5; ujy = 9.5
+ dujx = 3.5; dujy = 4.5
+ elif vertex == 1:
+ # Lagrange vertex 9, vertex i: 4, vertex j: 7
+ dkp = 1.77538035254; lp = 3.8
+ dkq = 0.14794836271; lq = 4.8
+
+ # vertex i
+ Aix = 1.3; Aiy = 1.3
+ rix = -9.8; riy = -8.8
+ uix = 8.3; uiy = 9.3
+ duix = 3.3; duiy = 4.3
+
+ # vertex j
+ Ajx = 1.7; Ajy = 1.7
+ rjx = +9.8; rjy = +8.8
+ ujx = 8.7; ujy = 9.7
+ dujx = 3.7; dujy = 4.7
+
Sppi = Aix*Ajx / (Aix + Ajx)
Sqqi = Aix*Ajx / (Aix + Ajx)
@@ -66,11 +85,24 @@
ddujx = +1.0/Ajx * (Cpx*dlp + Cqx*dlq)
ddujy = +1.0/Ajy * (Cpy*dlp + Cqy*dlq)
- #print "Aru",Aru
- #print "Aruslip",Aruslip
- #print "Si",Si
- #print "dlip",dlp
+ print "Sppi",Sppi
+ print "Sqqi",Sqqi
+ print "Arup",Arup
+ print "Aruq",Aruq
+
+ print "Arupslip",Arupslip
+ print "Aruqslip",Aruqslip
+
+ print "dlp",dlp
+ print "dlq",dlq
+
+ print "dduix:",dduix
+ print "dduiy:",dduiy
+
+ print "ddujx:",ddujx
+ print "ddujy:",ddujy
+
print duix+dduix,duiy+dduiy
print dujx+ddujx,dujy+ddujy
print lp+dlp,lq+dlq
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py 2010-01-28 17:37:35 UTC (rev 16191)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/slipth.py 2010-01-29 01:23:42 UTC (rev 16192)
@@ -1,11 +1,11 @@
from math import *
-finalSlip = (2.3, 0.1, 0.0)
-riseTime = 1.4
+finalSlip = (2.4, 0.2, 0.0)
+riseTime = 1.5
slipMag = (finalSlip[0]**2+finalSlip[1]**2+finalSlip[2]**2)**0.5
-slipTime1 = 1.2
+slipTime1 = 1.3
slipTime2 = 1.5
t = 2.134
dt = 0.01
More information about the CIG-COMMITS
mailing list