[cig-commits] r20071 - in short/3D/PyLith/branches/pylith-scecdynrup: . pylith/faults pylith/feassemble tests_auto/2d/quad4 unittests/pytests/faults/data
brad at geodynamics.org
brad at geodynamics.org
Thu May 10 13:24:57 PDT 2012
Author: brad
Date: 2012-05-10 13:24:56 -0700 (Thu, 10 May 2012)
New Revision: 20071
Added:
short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/data/tri3_changetractions.spatialdb
Modified:
short/3D/PyLith/branches/pylith-scecdynrup/TODO
short/3D/PyLith/branches/pylith-scecdynrup/pylith/faults/FaultCohesiveDyn.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATLagrange.py
short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATSimplex.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionCompression.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionOpening.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearSliding.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearStick.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningCompression.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningOpening.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearSliding.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearStick.py
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_compression.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_opening.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_sliding.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_stick.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_compression.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_opening.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg
short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_stick.cfg
Log:
Merge from trunk (v1.7-trunk).
Modified: short/3D/PyLith/branches/pylith-scecdynrup/TODO
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/TODO 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/TODO 2012-05-10 20:24:56 UTC (rev 20071)
@@ -17,9 +17,9 @@
CURRENT ISSUES/PRIORITIES
======================================================================
-* Add pytables to PyLith binary
+* Add h5py to PyLith binary
-* Add pytables to PyLith installer
+* Use h5py for automated full-scale tests.
* Setup fieldsplit for SolverNonlinear [Matt]
@@ -33,9 +33,8 @@
cell.shape -> cell.dimension
- Order of tensor components for Xdmf files
- Drucker Prager fit to yield surface
- - Drucker Prage allow tensile yield
- - Slip-weakening healing parameter
- - Green's functions
+ - Drucker Prager allow tensile yield
+ - Output soln points
+ Interpolation
* Accuracy of interpolation?
- Examples/Tutorials
@@ -47,8 +46,12 @@
- User specified start time (default is 0.0)
- PETSc w/CUDA
- FaultCohesiveDyn
- Add switch for turning on/off zero tractions for fault opening
- Added step20
+ + Add switch for turning on/off zero tractions for fault opening
+ Added step20
+ + Switched to time-dependent formulation for prescribed tractions
+ + friction
+ - Slip-weakening healing parameter
+ - Changed regularization of rate and state friction
- Green's functions
examples/2d/greensfns
@@ -74,10 +77,6 @@
1.8.0
======================================================================
-* Make nucleation for spontaneous rupture modular [BRAD]
-
- spatial and temporal variation in shear/normal stress for nucleation
-
* GenMaxwellQpQs [BRAD]
* GPU utilization
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/faults/FaultCohesiveDyn.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/faults/FaultCohesiveDyn.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/faults/FaultCohesiveDyn.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -63,7 +63,7 @@
validator=pyre.inventory.greaterEqual(0.0))
zeroTolerance.meta['tip'] = "Tolerance for detecting zero values."
- openFreeSurf = pyre.inventory.bool("open_free_surface", default=False)
+ openFreeSurf = pyre.inventory.bool("open_free_surface", default=True)
openFreeSurf.meta['tip'] = "If True, enforce traction free surface when " \
"the fault opens, otherwise use initial tractions even when the " \
"fault opens."
@@ -115,7 +115,6 @@
self._info.log("Pre-initializing fault '%s'." % self.label())
FaultCohesive.preinitialize(self, mesh)
Integrator.preinitialize(self, mesh)
- self.tract.preinitialize(mesh)
ModuleFaultCohesiveDyn.quadrature(self, self.faultQuadrature)
@@ -126,7 +125,7 @@
"dip_dir"]
if not isinstance(self.tract, NullComponent):
- print "HERE",self.tract.availableFields
+ self.tract.preinitialize(mesh)
self.availableFields['vertex']['info'] += self.tract.availableFields['vertex']['info']
self.availableFields['vertex']['info'] += \
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATLagrange.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATLagrange.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATLagrange.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -31,8 +31,8 @@
import numpy
def validateDimension(dim):
- if dim < 1 or dim > 3:
- raise ValueError("Dimension of Lagrange cell must be 1, 2, or 3.")
+ if dim < 0 or dim > 3:
+ raise ValueError("Dimension of Lagrange cell must be 0, 1, 2, or 3.")
return dim
Modified: short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATSimplex.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATSimplex.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/pylith/feassemble/FIATSimplex.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -28,8 +28,8 @@
import numpy
def validateDimension(dim):
- if dim < 1 or dim > 3:
- raise ValueError("Dimension of simplex cell must be 1, 2, or 3.")
+ if dim < 0 or dim > 3:
+ raise ValueError("Dimension of simplex cell must be 0, 1, 2, or 3.")
return dim
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionCompression.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionCompression.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionCompression.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","friction_coefficient","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","friction_coefficient","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -148,7 +148,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionOpening.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionOpening.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionOpening.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","friction_coefficient","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","friction_coefficient","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -149,7 +149,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearSliding.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearSliding.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearSliding.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","friction_coefficient","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","friction_coefficient","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -157,7 +157,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearStick.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearStick.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestFrictionShearStick.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","friction_coefficient","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","friction_coefficient","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -148,7 +148,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningCompression.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningCompression.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningCompression.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -150,7 +150,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningOpening.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningOpening.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningOpening.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -151,7 +151,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearSliding.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearSliding.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearSliding.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -160,7 +160,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearStick.py
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearStick.py 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/TestSlipWeakeningShearStick.py 2012-05-10 20:24:56 UTC (rev 20071)
@@ -83,7 +83,7 @@
return
filename = "%s-fault_info.vtk" % self.outputRoot
- fields = ["strike_dir", "normal_dir", "initial_traction","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
+ fields = ["strike_dir", "normal_dir", "traction_initial","static_coefficient","dynamic_coefficient","slip_weakening_parameter","cohesion"]
check_vertex_fields(self, filename, self.faultMesh, fields)
return
@@ -150,7 +150,7 @@
field[:,0] = normalDir[0]
field[:,1] = normalDir[1]
- elif name == "initial_traction":
+ elif name == "traction_initial":
field = numpy.zeros( (nvertices, 3), dtype=numpy.float64)
field[:,0] = initialTraction[0]
field[:,1] = initialTraction[1]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_compression.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_compression.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_compression.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -103,18 +103,20 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = Initial fault tractions
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
-
friction.label = Static friction
friction.db_properties = spatialdata.spatialdb.UniformDB
friction.db_properties.label = Static friction
friction.db_properties.values = [friction-coefficient,cohesion]
friction.db_properties.data = [0.6*m,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+[friction_compression.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -1.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -161,7 +163,7 @@
# Give basename for VTK fault output.
[friction_compression.timedependent.interfaces.fault.output]
writer.filename = friction_compression-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,friction_coefficient,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,friction_coefficient,cohesion]
# Give basename for VTK output of state variables.
[friction_compression.timedependent.materials.material.output]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_opening.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_opening.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_opening.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -103,17 +103,20 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = Initial fault tractions
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
-
friction.label = Static friction
friction.db_properties = spatialdata.spatialdb.UniformDB
friction.db_properties.label = Static friction
friction.db_properties.values = [friction-coefficient,cohesion]
friction.db_properties.data = [0.6,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[friction_opening.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -1.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -163,7 +166,7 @@
# Give basename for VTK fault output.
[friction_opening.timedependent.interfaces.fault.output]
writer.filename = friction_opening-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,friction_coefficient,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,friction_coefficient,cohesion]
# Give basename for VTK output of state variables.
[friction_opening.timedependent.materials.material.output]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_sliding.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_sliding.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_sliding.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -123,17 +123,20 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = Initial fault tractions
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
-
friction.label = Static friction
friction.db_properties = spatialdata.spatialdb.UniformDB
friction.db_properties.label = Static friction
friction.db_properties.values = [friction-coefficient,cohesion]
friction.db_properties.data = [0.6,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[friction_shear_sliding.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -1.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -180,7 +183,7 @@
# Give basename for VTK fault output.
[friction_shear_sliding.timedependent.interfaces.fault.output]
writer.filename = friction_shear_sliding-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,friction_coefficient,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,friction_coefficient,cohesion]
# Give basename for VTK output of state variables.
[friction_shear_sliding.timedependent.materials.material.output]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_stick.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_stick.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/friction_shear_stick.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -130,17 +130,20 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = Initial fault tractions
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -10.0*MPa]
-
friction.label = Static friction
friction.db_properties = spatialdata.spatialdb.UniformDB
friction.db_properties.label = Static friction
friction.db_properties.values = [friction-coefficient,cohesion]
friction.db_properties.data = [0.6,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[friction_shear_stick.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -10.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -186,7 +189,7 @@
# Give basename for VTK fault output.
[friction_shear_stick.timedependent.interfaces.fault.output]
writer.filename = friction_shear_stick-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,friction_coefficient,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,friction_coefficient,cohesion]
# Give basename for VTK output of state variables.
[friction_shear_stick.timedependent.materials.material.output]
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_compression.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_compression.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_compression.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -101,11 +101,6 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = Initial fault tractions
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
-
friction = pylith.friction.SlipWeakening
friction.label = Slip-weakening friction
@@ -114,6 +109,14 @@
friction.db_properties.values = [static-coefficient,dynamic-coefficient,slip-weakening-parameter,cohesion]
friction.db_properties.data = [0.6,0.59,0.2*m,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[slipweakening_compression.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -1.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -160,7 +163,7 @@
# Give basename for VTK fault output.
[slipweakening_compression.timedependent.interfaces.fault.output]
writer.filename = slipweakening_compression-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
vertex_data_fields = [slip,traction,cumulative_slip,previous_slip]
# Give basename for VTK output of state variables.
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_opening.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_opening.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_opening.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -100,11 +100,6 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = "Initial fault tractions"
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
-
friction = pylith.friction.SlipWeakening
friction.label = Slip-weakening friction
@@ -113,6 +108,14 @@
friction.db_properties.values = [static-coefficient,dynamic-coefficient,slip-weakening-parameter,cohesion]
friction.db_properties.data = [0.6,0.59,0.2*m,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[slipweakening_opening.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -1.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -152,7 +155,7 @@
# Give basename for VTK fault output.
[slipweakening_opening.timedependent.interfaces.fault.output]
writer.filename = slipweakening_opening-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
vertex_data_fields = [slip,traction,cumulative_slip,previous_slip]
# Give basename for VTK output of state variables.
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -125,11 +125,6 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = "Initial fault tractions"
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
-
friction = pylith.friction.SlipWeakening
friction.label = Slip-weakening friction
@@ -138,6 +133,14 @@
friction.db_properties.values = [static-coefficient,dynamic-coefficient,slip-weakening-parameter,cohesion]
friction.db_properties.data = [0.61,0.6,0.2*m,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[slipweakening_shear_sliding.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = "Initial fault tractions"
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -1.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -173,7 +176,7 @@
# Give basename for VTK fault output.
[slipweakening_shear_sliding.timedependent.interfaces.fault.output]
writer.filename = slipweakening_shear_sliding-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
vertex_data_fields = [slip,traction,cumulative_slip,previous_slip]
# Give basename for VTK output of state variables.
Modified: short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_stick.cfg
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_stick.cfg 2012-05-10 20:24:16 UTC (rev 20070)
+++ short/3D/PyLith/branches/pylith-scecdynrup/tests_auto/2d/quad4/slipweakening_shear_stick.cfg 2012-05-10 20:24:56 UTC (rev 20071)
@@ -129,11 +129,6 @@
quadrature.cell = pylith.feassemble.FIATLagrange
quadrature.cell.dimension = 1
-db_initial_tractions = spatialdata.spatialdb.UniformDB
-db_initial_tractions.label = "Initial fault tractions"
-db_initial_tractions.values = [traction-shear,traction-normal]
-db_initial_tractions.data = [0.0*Pa, -10.0*MPa]
-
friction = pylith.friction.SlipWeakening
friction.label = Slip weakening friction
@@ -142,6 +137,14 @@
friction.db_properties.values = [static-coefficient,dynamic-coefficient,slip-weakening-parameter,cohesion]
friction.db_properties.data = [0.6,0.59,0.2*m,0.0*Pa]
+traction_perturbation = pylith.faults.TractPerturbation
+
+[slipweakening_shear_stick.timedependent.interfaces.fault.traction_perturbation]
+db_initial = spatialdata.spatialdb.UniformDB
+db_initial.label = Initial fault tractions
+db_initial.values = [traction-shear,traction-normal]
+db_initial.data = [0.0*Pa, -10.0*MPa]
+
# ----------------------------------------------------------------------
# PETSc
# ----------------------------------------------------------------------
@@ -188,7 +191,7 @@
# Give basename for VTK fault output.
[slipweakening_shear_stick.timedependent.interfaces.fault.output]
writer.filename = slipweakening_shear_stick-fault.vtk
-vertex_info_fields = [strike_dir,normal_dir,initial_traction,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
+vertex_info_fields = [strike_dir,normal_dir,traction_initial_value,static_coefficient,dynamic_coefficient,slip_weakening_parameter,cohesion]
vertex_data_fields = [slip,traction,cumulative_slip,previous_slip]
# Give basename for VTK output of state variables.
Copied: short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/data/tri3_changetractions.spatialdb (from rev 20070, short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/data/tri3_changetractions.spatialdb)
===================================================================
--- short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/data/tri3_changetractions.spatialdb (rev 0)
+++ short/3D/PyLith/branches/pylith-scecdynrup/unittests/pytests/faults/data/tri3_changetractions.spatialdb 2012-05-10 20:24:56 UTC (rev 20071)
@@ -0,0 +1,15 @@
+#SPATIAL.ascii 1
+SimpleDB {
+ num-values = 3
+ value-names = traction-shear traction-normal change-start-time
+ value-units = Pa Pa s
+ num-locs = 2
+ data-dim = 1
+ space-dim = 2
+ cs-data = cartesian {
+ to-meters = 1.0
+ space-dim = 2
+ }
+}
+0.0 +1.0 -0.5 +1.0 1.5
+0.0 -1.0 -0.7 +0.8 2.5
More information about the CIG-COMMITS
mailing list