[cig-commits] [commit] knepley/fix-faults-parallel: Update full-scale tests for inclusion of fault halo. (5276eb6)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Fri Apr 18 13:33:42 PDT 2014
Repository : ssh://geoshell/pylith
On branch : knepley/fix-faults-parallel
Link : https://github.com/geodynamics/pylith/compare/1cbca9cbd832376cceca629383ad3c8e3db090f0...1169098c7387a0574706ddb12645c08f3401a304
>---------------------------------------------------------------
commit 5276eb61f15ca5777c3bfe4bf6f0680e1c5ac61a
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Fri Apr 18 12:45:39 2014 -0700
Update full-scale tests for inclusion of fault halo.
>---------------------------------------------------------------
5276eb61f15ca5777c3bfe4bf6f0680e1c5ac61a
tests_auto/2d/tri3/TestShearDispNoSlip.py | 10 ++++++++--
tests_auto/2d/tri3/TestShearDispNoSlipRefine.py | 10 ++++++++--
tests_auto/2d/tri3/sheardispnoslip.cfg | 2 +-
tests_auto/2d/tri3/sheardispnosliprefine.cfg | 1 +
tests_auto/3d/hex8/TestShearDispNoSlip.py | 12 ++++++++++--
tests_auto/3d/tet4/TestShearDispNoSlip.py | 11 +++++++++--
tests_auto/3d/tet4/TestShearDispNoSlipRefine.py | 11 +++++++++--
tests_auto/3d/tet4/sheardispnoslip.cfg | 1 +
tests_auto/3d/tet4/sheardispnosliprefine.cfg | 1 +
9 files changed, 48 insertions(+), 11 deletions(-)
diff --git a/tests_auto/2d/tri3/TestShearDispNoSlip.py b/tests_auto/2d/tri3/TestShearDispNoSlip.py
index c293df4..f643477 100644
--- a/tests_auto/2d/tri3/TestShearDispNoSlip.py
+++ b/tests_auto/2d/tri3/TestShearDispNoSlip.py
@@ -63,9 +63,9 @@ class TestShearDispNoSlip(TestTri3):
TestTri3.setUp(self)
self.nverticesO = self.mesh['nvertices']
self.mesh['nvertices'] += 3
- self.faultMesh = {'nvertices': 3,
+ self.faultMesh = {'nvertices': 5,
'spaceDim': 2,
- 'ncells': 2,
+ 'ncells': 4,
'ncorners': 2}
run_pylith()
self.outputRoot = "sheardispnoslip"
@@ -163,6 +163,12 @@ class TestShearDispNoSlip(TestTri3):
else:
raise ValueError("Unknown fault field '%s'." % name)
+ # Mask clamped vertices
+ maskX = numpy.bitwise_and(vertices[:,0] >= -2.0001e+3, vertices[:,0] <= 1.0)
+ maskY = numpy.fabs(vertices[:,1]) <= 0.01e+3
+ mask = numpy.bitwise_and(maskX,maskY)
+ field[:,~mask,:] = 0
+
return field
diff --git a/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py b/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py
index ef36afc..3092974 100644
--- a/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py
+++ b/tests_auto/2d/tri3/TestShearDispNoSlipRefine.py
@@ -68,9 +68,9 @@ class TestShearDispNoSlipRefine(TestTri3):
'tensorSize': 3}
self.nverticesO = self.mesh['nvertices']
self.mesh['nvertices'] += 5
- self.faultMesh = {'nvertices': 5,
+ self.faultMesh = {'nvertices': 9,
'spaceDim': 2,
- 'ncells': 2*2,
+ 'ncells': 4*2,
'ncorners': 2}
run_pylith()
self.outputRoot = "sheardispnosliprefine"
@@ -168,6 +168,12 @@ class TestShearDispNoSlipRefine(TestTri3):
else:
raise ValueError("Unknown fault field '%s'." % name)
+ # Mask clamped vertices
+ maskX = numpy.bitwise_and(vertices[:,0] >= -2.0001e+3, vertices[:,0] <= 1.0)
+ maskY = numpy.fabs(vertices[:,1]) <= 0.01e+3
+ mask = numpy.bitwise_and(maskX,maskY)
+ field[:,~mask,:] = 0
+
return field
diff --git a/tests_auto/2d/tri3/sheardispnoslip.cfg b/tests_auto/2d/tri3/sheardispnoslip.cfg
index f4e03e6..8a24838 100644
--- a/tests_auto/2d/tri3/sheardispnoslip.cfg
+++ b/tests_auto/2d/tri3/sheardispnoslip.cfg
@@ -129,7 +129,7 @@ ksp_gmres_restart = 50
#ksp_converged_reason = true
#log_summary = true
-# start_in_debugger = true
+#start_in_debugger = true
# ----------------------------------------------------------------------
diff --git a/tests_auto/2d/tri3/sheardispnosliprefine.cfg b/tests_auto/2d/tri3/sheardispnosliprefine.cfg
index 2a0071a..783cd47 100644
--- a/tests_auto/2d/tri3/sheardispnosliprefine.cfg
+++ b/tests_auto/2d/tri3/sheardispnosliprefine.cfg
@@ -7,6 +7,7 @@ command = mpirun -np ${nodes}
# journal
# ----------------------------------------------------------------------
[sheardispnosliprefine.journal.info]
+sheardispnosliprefine = 1
#timedependent = 1
#implicit = 1
#petsc = 1
diff --git a/tests_auto/3d/hex8/TestShearDispNoSlip.py b/tests_auto/3d/hex8/TestShearDispNoSlip.py
index d52eb9f..119fc38 100644
--- a/tests_auto/3d/hex8/TestShearDispNoSlip.py
+++ b/tests_auto/3d/hex8/TestShearDispNoSlip.py
@@ -63,9 +63,9 @@ class TestShearDispNoSlip(TestHex8):
TestHex8.setUp(self)
self.nverticesO = self.mesh['nvertices']
self.mesh['nvertices'] += 21
- self.faultMesh = {'nvertices': 21,
+ self.faultMesh = {'nvertices': 34,
'spaceDim': 3,
- 'ncells': 12,
+ 'ncells': 23,
'ncorners': 4}
run_pylith()
@@ -141,6 +141,7 @@ class TestShearDispNoSlip(TestHex8):
nvertices = self.faultMesh['nvertices']
+
if name == "normal_dir":
field = numpy.zeros( (1, nvertices, 3), dtype=numpy.float64)
field[0,:,0] = normalDir[0]
@@ -165,6 +166,13 @@ class TestShearDispNoSlip(TestHex8):
else:
raise ValueError("Unknown fault field '%s'." % name)
+ # Mask clamped vertices
+ maskX = numpy.fabs(vertices[:,0]) <= 1.0
+ maskY = numpy.fabs(vertices[:,1]) <= 25.001e+3
+ maskZ = vertices[:,2] >= -20.001e+3
+ mask = numpy.bitwise_and(numpy.bitwise_and(maskX,maskY),maskZ)
+ field[:,~mask,:] = 0.0
+
return field
diff --git a/tests_auto/3d/tet4/TestShearDispNoSlip.py b/tests_auto/3d/tet4/TestShearDispNoSlip.py
index 23fb9b8..2fd5771 100644
--- a/tests_auto/3d/tet4/TestShearDispNoSlip.py
+++ b/tests_auto/3d/tet4/TestShearDispNoSlip.py
@@ -63,9 +63,9 @@ class TestShearDispNoSlip(TestTet4):
TestTet4.setUp(self)
self.nverticesO = self.mesh['nvertices']
self.mesh['nvertices'] += 19
- self.faultMesh = {'nvertices': 19,
+ self.faultMesh = {'nvertices': 32,
'spaceDim': 3,
- 'ncells': 20,
+ 'ncells': 43,
'ncorners': 3}
run_pylith()
self.outputRoot = "sheardispnoslip"
@@ -164,6 +164,13 @@ class TestShearDispNoSlip(TestTet4):
else:
raise ValueError("Unknown fault field '%s'." % name)
+ # Mask clamped edges
+ maskX = numpy.fabs(vertices[:,0]) <= 1.0
+ maskY = numpy.fabs(vertices[:,1]) <= 25.001e+3
+ maskZ = vertices[:,2] >= -20.001e+3
+ mask = numpy.bitwise_and(numpy.bitwise_and(maskX,maskY),maskZ)
+ field[:,~mask,:] = 0.0
+
return field
diff --git a/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py b/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py
index 356af4d..503fa54 100644
--- a/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py
+++ b/tests_auto/3d/tet4/TestShearDispNoSlipRefine.py
@@ -69,9 +69,9 @@ class TestShearDispNoSlipRefine(TestTet4):
'tensorSize': 6}
self.nverticesO = self.mesh['nvertices']
self.mesh['nvertices'] +=57
- self.faultMesh = {'nvertices': 57,
+ self.faultMesh = {'nvertices': 106,
'spaceDim': 3,
- 'ncells': 20*4,
+ 'ncells': 43*4,
'ncorners': 3}
run_pylith()
self.outputRoot = "sheardispnosliprefine"
@@ -170,6 +170,13 @@ class TestShearDispNoSlipRefine(TestTet4):
else:
raise ValueError("Unknown fault field '%s'." % name)
+ # Mask clamped edges
+ maskX = numpy.fabs(vertices[:,0]) <= 1.0
+ maskY = numpy.fabs(vertices[:,1]) <= 25.001e+3
+ maskZ = vertices[:,2] >= -20.001e+3
+ mask = numpy.bitwise_and(numpy.bitwise_and(maskX,maskY),maskZ)
+ field[:,~mask,:] = 0.0
+
return field
diff --git a/tests_auto/3d/tet4/sheardispnoslip.cfg b/tests_auto/3d/tet4/sheardispnoslip.cfg
index abcb750..6b13258 100644
--- a/tests_auto/3d/tet4/sheardispnoslip.cfg
+++ b/tests_auto/3d/tet4/sheardispnoslip.cfg
@@ -8,6 +8,7 @@ command = mpirun -np ${nodes}
# journal
# ----------------------------------------------------------------------
[sheardispnoslip.journal.info]
+sheardispnoslip = 1
timedependent = 1
implicit = 1
petsc = 1
diff --git a/tests_auto/3d/tet4/sheardispnosliprefine.cfg b/tests_auto/3d/tet4/sheardispnosliprefine.cfg
index cf4e499..3a1dd7e 100644
--- a/tests_auto/3d/tet4/sheardispnosliprefine.cfg
+++ b/tests_auto/3d/tet4/sheardispnosliprefine.cfg
@@ -7,6 +7,7 @@ command = mpirun -np ${nodes}
# journal
# ----------------------------------------------------------------------
[sheardispnosliprefine.journal.info]
+sheardispnosliprefine = 1
timedependent = 1
implicit = 1
petsc = 1
More information about the CIG-COMMITS
mailing list