[cig-commits] [commit] knepley/fix-parallel-mult-faults, master, next: Setup example for 2 proc test with 2 faults. (f04210a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Apr 9 03:04:28 PDT 2014
Repository : ssh://geoshell/pylith
On branches: knepley/fix-parallel-mult-faults,master,next
Link : https://github.com/geodynamics/pylith/compare/a213c3005450d915f40c7137ff7d8dbbb439d334...1b3d6d3bc246edc4235d0051142d675d91e9be41
>---------------------------------------------------------------
commit f04210a9939f366b499dc580318f1e8f0eec0a9c
Author: Brad Aagaard <baagaard at usgs.gov>
Date: Sun Mar 30 17:17:32 2014 -0700
Setup example for 2 proc test with 2 faults.
>---------------------------------------------------------------
f04210a9939f366b499dc580318f1e8f0eec0a9c
...estSlipTwoFaults.py => TestSlipTwoFaultsNP2.py} | 14 ++--
.../{sliptwofaults.cfg => sliptwofaults_np2.cfg} | 75 +++++++++++-----------
2 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/tests_auto/3d/tet4/TestSlipTwoFaults.py b/tests_auto/3d/tet4/TestSlipTwoFaultsNP2.py
similarity index 93%
copy from tests_auto/3d/tet4/TestSlipTwoFaults.py
copy to tests_auto/3d/tet4/TestSlipTwoFaultsNP2.py
index 4e8952d..ab960d5 100644
--- a/tests_auto/3d/tet4/TestSlipTwoFaults.py
+++ b/tests_auto/3d/tet4/TestSlipTwoFaultsNP2.py
@@ -16,7 +16,7 @@
# ----------------------------------------------------------------------
#
-## @file tests/3d/tet4/TestSlipTwoFaults.py
+## @file tests/3d/tet4/TestSlipTwoFaultsNP2.py
##
## @brief Test suite for testing pylith with shear slip.
@@ -26,9 +26,9 @@ from sliptwofaults_soln import AnalyticalSoln
# Local version of PyLithApp
from pylith.apps.PyLithApp import PyLithApp
-class SlipTwoFaultsApp(PyLithApp):
+class SlipTwoFaultsNP2App(PyLithApp):
def __init__(self):
- PyLithApp.__init__(self, name="sliptwofaults")
+ PyLithApp.__init__(self, name="sliptwofaults_np2")
return
@@ -38,13 +38,13 @@ def run_pylith():
Run pylith.
"""
if not "dtwo" in dir(run_pylith):
- app = SlipTwoFaultsApp()
+ app = SlipTwoFaultsNP2App()
run_pylith.dtwo = True # Put before run() so only called once
app.run()
return
-class TestSlipTwoFaults(TestTet4):
+class TestSlipTwoFaultsNP2(TestTet4):
"""
Test suite for testing pylith with shear slip on two faults.
"""
@@ -65,7 +65,7 @@ class TestSlipTwoFaults(TestTet4):
'ncells': 72,
'ncorners': 3}
run_pylith()
- self.outputRoot = "sliptwofaults"
+ self.outputRoot = "sliptwofaults_np2"
self.soln = AnalyticalSoln()
return
@@ -190,7 +190,7 @@ class TestSlipTwoFaults(TestTet4):
# ----------------------------------------------------------------------
if __name__ == '__main__':
import unittest
- from TestSlipTwoFaults import TestSlipTwoFaults as Tester
+ from TestSlipTwoFaultsNP2 import TestSlipTwoFaultsNP2 as Tester
suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(Tester))
diff --git a/tests_auto/3d/tet4/sliptwofaults.cfg b/tests_auto/3d/tet4/sliptwofaults_np2.cfg
similarity index 71%
copy from tests_auto/3d/tet4/sliptwofaults.cfg
copy to tests_auto/3d/tet4/sliptwofaults_np2.cfg
index f416daa..b1bbb66 100644
--- a/tests_auto/3d/tet4/sliptwofaults.cfg
+++ b/tests_auto/3d/tet4/sliptwofaults_np2.cfg
@@ -1,48 +1,49 @@
-[sliptwofaults]
+[sliptwofaults_np2]
+nodes = 2
# ----------------------------------------------------------------------
# journal
# ----------------------------------------------------------------------
-[sliptwofaults.journal.info]
-#timedependent = 1
-#implicit = 1
-#petsc = 1
-#solverlinear = 1
-#meshimporter = 1
-#meshiocubit = 1
-#implicitelasticity = 1
-#quadrature2d = 1
-#fiatsimplex = 1
+[sliptwofaults_np2.journal.info]
+timedependent = 1
+implicit = 1
+petsc = 1
+solverlinear = 1
+meshimporter = 1
+meshiocubit = 1
+implicitelasticity = 1
+quadrature2d = 1
+fiatsimplex = 1
# ----------------------------------------------------------------------
# mesh_generator
# ----------------------------------------------------------------------
-[sliptwofaults.mesh_generator]
+[sliptwofaults_np2.mesh_generator]
reader = pylith.meshio.MeshIOCubit
reorder_mesh = True
-[sliptwofaults.mesh_generator.reader]
+[sliptwofaults_np2.mesh_generator.reader]
filename = mesh.exo
coordsys.space_dim = 3
# ----------------------------------------------------------------------
# problem
# ----------------------------------------------------------------------
-[sliptwofaults.timedependent]
+[sliptwofaults_np2.timedependent]
dimension = 3
-[sliptwofaults.timedependent.formulation.time_step]
+[sliptwofaults_np2.timedependent.formulation.time_step]
total_time = 0.0*s
# ----------------------------------------------------------------------
# materials
# ----------------------------------------------------------------------
-[sliptwofaults.timedependent]
+[sliptwofaults_np2.timedependent]
materials = [elastic,viscoelastic]
materials.elastic = pylith.materials.ElasticIsotropic3D
materials.viscoelastic = pylith.materials.ElasticIsotropic3D
-[sliptwofaults.timedependent.materials.elastic]
+[sliptwofaults_np2.timedependent.materials.elastic]
label = Elastic material
id = 1
db_properties.label = Elastic properties
@@ -50,7 +51,7 @@ db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
quadrature.cell.dimension = 3
-[sliptwofaults.timedependent.materials.viscoelastic]
+[sliptwofaults_np2.timedependent.materials.viscoelastic]
label = Elastic material
id = 2
db_properties.label = Elastic properties
@@ -61,10 +62,10 @@ quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# boundary conditions
# ----------------------------------------------------------------------
-[sliptwofaults.timedependent]
+[sliptwofaults_np2.timedependent]
bc = [x_neg,x_pos]
-[sliptwofaults.timedependent.bc.x_pos]
+[sliptwofaults_np2.timedependent.bc.x_pos]
bc_dof = [0, 1, 2]
label = face_xpos
db_initial = spatialdata.spatialdb.UniformDB
@@ -72,7 +73,7 @@ db_initial.label = Dirichlet BC +x edge
db_initial.values = [displacement-x, displacement-y, displacement-z]
db_initial.data = [0.0*m,+1.0*m,0.0*m]
-[sliptwofaults.timedependent.bc.x_neg]
+[sliptwofaults_np2.timedependent.bc.x_neg]
bc_dof = [0, 1, 2]
label = face_xneg
db_initial = spatialdata.spatialdb.UniformDB
@@ -83,15 +84,15 @@ db_initial.data = [0.0*m,+1.0*m,0.0*m]
# ----------------------------------------------------------------------
# faults
# ----------------------------------------------------------------------
-[sliptwofaults.timedependent]
+[sliptwofaults_np2.timedependent]
interfaces = [fault1,fault2]
-[sliptwofaults.timedependent.interfaces.fault1]
+[sliptwofaults_np2.timedependent.interfaces.fault1]
id = 10
label = fault_x_thru
quadrature.cell.dimension = 2
-[sliptwofaults.timedependent.interfaces.fault1.eq_srcs.rupture.slip_function]
+[sliptwofaults_np2.timedependent.interfaces.fault1.eq_srcs.rupture.slip_function]
slip = spatialdata.spatialdb.UniformDB
slip.label = Final slip
slip.values = [left-lateral-slip,reverse-slip,fault-opening]
@@ -102,12 +103,12 @@ slip_time.label = Slip start time
slip_time.values = [slip-time]
slip_time.data = [0.0*s]
-[sliptwofaults.timedependent.interfaces.fault2]
+[sliptwofaults_np2.timedependent.interfaces.fault2]
id = 20
label = fault_x2_thru
quadrature.cell.dimension = 2
-[sliptwofaults.timedependent.interfaces.fault2.eq_srcs.rupture.slip_function]
+[sliptwofaults_np2.timedependent.interfaces.fault2.eq_srcs.rupture.slip_function]
slip = spatialdata.spatialdb.UniformDB
slip.label = Final slip
slip.values = [left-lateral-slip,reverse-slip,fault-opening]
@@ -121,7 +122,7 @@ slip_time.data = [0.0*s]
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
-[sliptwofaults.petsc]
+[sliptwofaults_np2.petsc]
pc_type = asm
# Change the preconditioner settings.
@@ -142,24 +143,24 @@ ksp_gmres_restart = 50
# ----------------------------------------------------------------------
# output
# ----------------------------------------------------------------------
-[sliptwofaults.problem.formulation.output.output]
+[sliptwofaults_np2.problem.formulation.output.output]
writer = pylith.meshio.DataWriterHDF5
-writer.filename = sliptwofaults.h5
+writer.filename = sliptwofaults_np2.h5
-[sliptwofaults.timedependent.materials.elastic.output]
+[sliptwofaults_np2.timedependent.materials.elastic.output]
cell_filter = pylith.meshio.CellFilterAvg
writer = pylith.meshio.DataWriterHDF5
-writer.filename = sliptwofaults-elastic.h5
+writer.filename = sliptwofaults_np2-elastic.h5
-[sliptwofaults.timedependent.materials.viscoelastic.output]
+[sliptwofaults_np2.timedependent.materials.viscoelastic.output]
cell_filter = pylith.meshio.CellFilterAvg
writer = pylith.meshio.DataWriterHDF5
-writer.filename = sliptwofaults-viscoelastic.h5
+writer.filename = sliptwofaults_np2-viscoelastic.h5
-[sliptwofaults.timedependent.interfaces.fault1.output]
+[sliptwofaults_np2.timedependent.interfaces.fault1.output]
writer = pylith.meshio.DataWriterHDF5
-writer.filename = sliptwofaults-fault1.h5
+writer.filename = sliptwofaults_np2-fault1.h5
-[sliptwofaults.timedependent.interfaces.fault2.output]
+[sliptwofaults_np2.timedependent.interfaces.fault2.output]
writer = pylith.meshio.DataWriterHDF5
-writer.filename = sliptwofaults-fault2.h5
+writer.filename = sliptwofaults_np2-fault2.h5
More information about the CIG-COMMITS
mailing list