[cig-commits] [commit] baagaard/feature-output-station-names, baagaard/feature-progress-monitor, baagaard/fix-faults-intersect, master: Added hex8 fault intersection full-scale test. (a69e27d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Nov 5 15:44:21 PST 2014
Repository : https://github.com/geodynamics/pylith
On branches: baagaard/feature-output-station-names,baagaard/feature-progress-monitor,baagaard/fix-faults-intersect,master
Link : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a
>---------------------------------------------------------------
commit a69e27d8e3ff60d86d7358d4a2241d3ca3e2845e
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Mon Jun 30 11:19:48 2014 -0700
Added hex8 fault intersection full-scale test.
>---------------------------------------------------------------
a69e27d8e3ff60d86d7358d4a2241d3ca3e2845e
.../3d/{tet4 => hex8}/TestFaultsIntersect.py | 31 +++++++++++-----------
tests_auto/3d/{tet4 => hex8}/faultsintersect.cfg | 14 +++++-----
tests_auto/3d/hex8/testpylith.py | 3 +++
tests_auto/3d/tet4/TestFaultsIntersect.py | 4 +--
4 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/tests_auto/3d/tet4/TestFaultsIntersect.py b/tests_auto/3d/hex8/TestFaultsIntersect.py
similarity index 88%
copy from tests_auto/3d/tet4/TestFaultsIntersect.py
copy to tests_auto/3d/hex8/TestFaultsIntersect.py
index b5c68e0..b133462 100644
--- a/tests_auto/3d/tet4/TestFaultsIntersect.py
+++ b/tests_auto/3d/hex8/TestFaultsIntersect.py
@@ -16,12 +16,12 @@
# ----------------------------------------------------------------------
#
-## @file tests/3d/tet4/TestFaultsIntersect.py
+## @file tests/3d/hex8/TestFaultsIntersect.py
##
## @brief Test suite for testing pylith with shear slip.
import numpy
-from TestTet4 import TestTet4
+from TestHex8 import TestHex8
from sliponefault_soln import AnalyticalSoln
# Local version of PyLithApp
@@ -37,14 +37,14 @@ def run_pylith():
"""
Run pylith.
"""
- if not "dtwo" in dir(run_pylith):
+ if not "done" in dir(run_pylith):
app = FaultsIntersectApp()
- run_pylith.dtwo = True # Put before run() so only called once
+ run_pylith.done = True # Put before run() so only called once
app.run()
return
-class TestFaultsIntersect(TestTet4):
+class TestFaultsIntersect(TestHex8):
"""
Test suite for testing pylith with shear slip on two faults.
"""
@@ -53,22 +53,23 @@ class TestFaultsIntersect(TestTet4):
"""
Setup for test.
"""
- TestTet4.setUp(self)
+ TestHex8.setUp(self)
self.nverticesO = self.mesh['nvertices']
# Fault x
- self.mesh['nvertices'] += 50
- self.faultMeshX = {'nvertices': 50,
+ self.mesh['nvertices'] += 55
+ self.faultMeshX = {'nvertices': 55,
'spaceDim': 3,
- 'ncells': 72,
- 'ncorners': 3}
+ 'ncells': 40,
+ 'ncorners': 4}
# Fault y
- self.mesh['nvertices'] += 2
- self.faultMeshY = {'nvertices': 9,
+ self.mesh['nvertices'] += 4
+ self.faultMeshY = {'nvertices': 12,
'spaceDim': 3,
- 'ncells': 8,
- 'ncorners': 3}
+ 'ncells': 6,
+ 'ncorners': 4}
+
run_pylith()
self.outputRoot = "faultsintersect"
@@ -147,7 +148,7 @@ class TestFaultsIntersect(TestTet4):
"""
if self.fault == "x":
- normalDir = (+1.0, 0.0, 0.0)
+ normalDir = (-1.0, 0.0, 0.0)
finalSlip = -2.0
faultMesh = self.faultMeshX
elif self.fault == "y":
diff --git a/tests_auto/3d/tet4/faultsintersect.cfg b/tests_auto/3d/hex8/faultsintersect.cfg
similarity index 94%
copy from tests_auto/3d/tet4/faultsintersect.cfg
copy to tests_auto/3d/hex8/faultsintersect.cfg
index 72b4a21..ce21fc0 100644
--- a/tests_auto/3d/tet4/faultsintersect.cfg
+++ b/tests_auto/3d/hex8/faultsintersect.cfg
@@ -12,8 +12,8 @@
#meshimporter = 1
#meshiocubit = 1
#implicitelasticity = 1
-#quadrature3d = 1
-#fiatsimplex = 1
+#quadrature2d = 1
+#fiatlagrange = 1
# ----------------------------------------------------------------------
# mesh_generator
@@ -48,7 +48,7 @@ label = Elastic material
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell = pylith.feassemble.FIATSimplex
+quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 3
[faultsintersect.timedependent.materials.viscoelastic]
@@ -56,7 +56,7 @@ label = Elastic material
id = 2
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell = pylith.feassemble.FIATSimplex
+quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
@@ -90,6 +90,7 @@ interfaces = [faultx,faulty]
[faultsintersect.timedependent.interfaces.faultx]
id = 10
label = fault_x_thru
+quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 2
[faultsintersect.timedependent.interfaces.faultx.eq_srcs.rupture.slip_function]
@@ -105,8 +106,9 @@ slip_time.data = [0.0*s]
[faultsintersect.timedependent.interfaces.faulty]
id = 20
-label = fault_y
-edge = fault_y_edge
+label = fault_y_trim
+edge = fault_y_trim_edge
+quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 2
[faultsintersect.timedependent.interfaces.faulty.eq_srcs.rupture.slip_function]
diff --git a/tests_auto/3d/hex8/testpylith.py b/tests_auto/3d/hex8/testpylith.py
index a488d7b..983ae9e 100644
--- a/tests_auto/3d/hex8/testpylith.py
+++ b/tests_auto/3d/hex8/testpylith.py
@@ -42,6 +42,9 @@ def suite():
from TestSlipTwoFaults import TestSlipTwoFaults
suite.addTest(unittest.makeSuite(TestSlipTwoFaults))
+ from TestFaultsIntersect import TestFaultsIntersect
+ suite.addTest(unittest.makeSuite(TestFaultsIntersect))
+
return suite
diff --git a/tests_auto/3d/tet4/TestFaultsIntersect.py b/tests_auto/3d/tet4/TestFaultsIntersect.py
index b5c68e0..8fca5bd 100644
--- a/tests_auto/3d/tet4/TestFaultsIntersect.py
+++ b/tests_auto/3d/tet4/TestFaultsIntersect.py
@@ -37,9 +37,9 @@ def run_pylith():
"""
Run pylith.
"""
- if not "dtwo" in dir(run_pylith):
+ if not "done" in dir(run_pylith):
app = FaultsIntersectApp()
- run_pylith.dtwo = True # Put before run() so only called once
+ run_pylith.done = True # Put before run() so only called once
app.run()
return
More information about the CIG-COMMITS
mailing list