[cig-commits] r18727 - in short/3D/PyLith/branches/v1.6-stable: pylith/bc tests_auto/1d/line2 tests_auto/1d/line3 tests_auto/2d/quad4 tests_auto/2d/tri3

brad at geodynamics.org brad at geodynamics.org
Mon Jul 11 12:01:05 PDT 2011


Author: brad
Date: 2011-07-11 12:01:04 -0700 (Mon, 11 Jul 2011)
New Revision: 18727

Modified:
   short/3D/PyLith/branches/v1.6-stable/pylith/bc/ZeroDispDB.py
   short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/dislocation.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensiondisp.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensionforce.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/lgdeformtranslation.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/axialextension.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/dislocation.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/axialdisp.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation2.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_compression.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_opening.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_sliding.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_stick.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformrigidbody.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformtraction.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/sheardisp.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_compression.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_opening.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_stick.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/axialdisp.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation2.cfg
   short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/sheardisp.cfg
Log:
Updated test config files to set labels for spatial databases, which are now required.

Modified: short/3D/PyLith/branches/v1.6-stable/pylith/bc/ZeroDispDB.py
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/pylith/bc/ZeroDispDB.py	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/pylith/bc/ZeroDispDB.py	2011-07-11 19:01:04 UTC (rev 18727)
@@ -56,7 +56,9 @@
     values = ["displacement-x", "displacement-y", "displacement-z"]
     data = [0.0*m, 0.0*m, 0.0*m]
 
+    label = pyre.inventory.str("label", default="Zero displacement BC.")
 
+
   # PUBLIC METHODS /////////////////////////////////////////////////////
 
   def __init__(self, name="zerodispdb"):

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/dislocation.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/dislocation.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -51,6 +51,7 @@
 [dislocation.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = line
 
@@ -75,7 +76,9 @@
 quadrature.cell.shape = point
 
 [dislocation.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
+slip.label = Final slip
 slip.iohandler.filename = finalslip.spatialdb
+slip_time.label = Slip time
 slip_time.iohandler.filename = sliptime.spatialdb
 
 

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensiondisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensiondisp.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensiondisp.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [extensiondisp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = line
 

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensionforce.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensionforce.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/extensionforce.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -48,6 +48,7 @@
 [extensionforce.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = line
 
@@ -64,6 +65,7 @@
 [extensionforce.timedependent.bc.fixed]
 bc_dof = [0]
 label = fault
+#db_initial.label = Zero displacement bc.
 
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/lgdeformtranslation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/lgdeformtranslation.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line2/lgdeformtranslation.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -50,6 +50,7 @@
 [pylithapp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = line
 

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/axialextension.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/axialextension.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/axialextension.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [axialextension.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = line
 quadrature.cell.degree = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/dislocation.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/1d/line3/dislocation.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [dislocation.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = line
 quadrature.cell.degree = 2
@@ -74,7 +75,9 @@
 quadrature.cell.shape = point
 
 [dislocation.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
+slip.label = Final slip
 slip.iohandler.filename = finalslip.spatialdb
+slip_time.label = Slip time
 slip_time.iohandler.filename = sliptime.spatialdb
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/axialdisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/axialdisp.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/axialdisp.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [axialdisp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -50,6 +50,7 @@
 [dislocation.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation2.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation2.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/dislocation2.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -55,6 +55,7 @@
 [pylithapp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_compression.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_compression.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_compression.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -40,13 +40,10 @@
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 3 boundary conditions: 'x_neg', 'y_neg' and 'x_pos'.
 bc = [x_neg,y_neg,x_pos]
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
-
 [friction_compression.timedependent.formulation.time_step]
 total_time = 0.0*s
 dt = 1.0*s
@@ -61,19 +58,12 @@
 material = pylith.materials.ElasticPlaneStrain
 
 [friction_compression.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
-label = elastic material
-
-# The cells associated with this material are given a material ID of 1
-# in the mesh file.
+label = Elastic material
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matprops.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
@@ -82,17 +72,14 @@
 # ----------------------------------------------------------------------
 # Provide information on the boundary conditions.
 
-# Boundary conditions to be applied to the negative x-side of the mesh.
 [friction_compression.timedependent.bc.x_neg]
 bc_dof = [0]
 label = 21
 
-# Boundary conditions to be applied to the negative y-side of the mesh.
 [friction_compression.timedependent.bc.y_neg]
 bc_dof = [1]
 label = 24
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [friction_compression.timedependent.bc.x_pos]
 bc_dof = [0]
 label = 20
@@ -110,13 +97,10 @@
 
 fault = pylith.faults.FaultCohesiveDyn
 
-# Define fault properties.
 [friction_compression.timedependent.interfaces.fault]
 
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
 
-# The quadrature for a 2D fault is 1D with a linear shape.
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -125,6 +109,7 @@
 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]

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_opening.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_opening.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_opening.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -41,24 +41,15 @@
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-# Specify the problem settings.
-# This is a time-dependent problem, so we select this as our problem type.
-# We select a total time of 0 sec, and a time step size of 1 sec, so we
-# are performing a single time step.
-# The spatial dimension for this problem is 2.
-# For an implicit formulation (using implicit.cfg), we will perform 1
-# implicit time step from t = -1.0 to t = 0.0 (elastic solution step).
 [friction_opening.timedependent]
 dimension = 2
 normalizer.length_scale = 1.0*m
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 2 boundary conditions: 'x_neg', 'x_pos'
 bc = [x_neg,x_pos]
 bc.x_pos=pylith.bc.DirichletBoundary
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 
@@ -70,51 +61,28 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [friction_opening.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [friction_opening.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
-label = elastic material
-
-# The cells associated with this material are given a material ID of 0
-# in the mesh file.
+label = Elastic material
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matelastic2D.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
-# Boundary conditions to be applied to the negative x-side of the mesh.
 [friction_opening.timedependent.bc.x_neg]
-
-# We are fixing the 0 (x) and 1 (y) degree of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_neg' in the mesh file.
 label = 21
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [friction_opening.timedependent.bc.x_pos]
-
-# We are fixing the 1 (y) and prescribing 0 (x) degree of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -130,32 +98,18 @@
 
 fault = pylith.faults.FaultCohesiveDyn
 
-# Define fault properties.
 [friction_opening.timedependent.interfaces.fault]
-
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
 
-# NOTE: It is possible to assign an ID number to a fault (e.g.,
-# 'id = 10').  Care must be taken when doing this, however, because the
-# assigned ID will become the material ID for the cohesive element.
-# This ID must not conflict with any of the material ID numbers for
-# volume elements.  The default ID for a fault is 100.  If you have a
-# fault in your mesh you must:
-# 1.  If you create your own fault ID, make sure it does not conflict
-#     with any of you material ID's.
-# 2.  If you use the default fault ID, make sure that none of your
-#     material ID's are equal to 100.
-
-# The quadrature for a 2D fault is 1D with a linear shape.
 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.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]

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_sliding.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_sliding.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_sliding.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -30,9 +30,6 @@
 #debug = 1
 reader = pylith.meshio.MeshIOCubit
 
-# This component specification means we are using PyLith ASCII format,
-# and we then specify the filename and number of space dimensions for
-# the mesh.
 [friction_shear_sliding.mesh_generator.reader]
 filename = mesh.exo
 use_nodeset_names = False
@@ -41,26 +38,17 @@
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-# Specify the problem settings.
-# This is a time-dependent problem, so we select this as our problem type.
-# We select a total time of 0 sec, and a time step size of 1 sec, so we
-# are performing a single time step.
-# The spatial dimension for this problem is 2.
-# For an implicit formulation (using implicit.cfg), we will perform 1
-# implicit time step from t = -1.0 to t = 0.0 (elastic solution step).
 [friction_shear_sliding.timedependent]
 dimension = 2
 normalizer.length_scale = 1.0*m
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 2 boundary conditions: 'x_neg', 'x_pos'
 bc = [x_neg,x_pos,y_pos_fault,y_neg_fault]
 bc.x_pos = pylith.bc.DirichletBoundary
 bc.y_pos_fault = pylith.bc.Neumann
 bc.y_neg_fault = pylith.bc.Neumann
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 
@@ -72,51 +60,27 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [friction_shear_sliding.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [friction_shear_sliding.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
-label = elastic material
-
-# The cells associated with this material are given a material ID of 0
-# in the mesh file.
+label = Elastic material
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matelastic2D.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
-
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
-# Boundary conditions to be applied to the negative x-side of the mesh.
 [friction_shear_sliding.timedependent.bc.x_neg]
-
-# We are fixing the 0 (x) and 1 (y) degrees of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_neg' in the mesh file.
 label = 21
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [friction_shear_sliding.timedependent.bc.x_pos]
-
-# We are fixing the 0 (x) and prescribing 1 (y) degree of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -126,11 +90,7 @@
 
 
 
-# Boundary conditions to be applied to the positive y-side of the mesh.
 [friction_shear_sliding.timedependent.bc.y_pos_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_pos_fault' in the mesh file.
 label = 22
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -138,15 +98,10 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-0.6*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
-# Boundary conditions to be applied to the negative y-side of the mesh.
 [friction_shear_sliding.timedependent.bc.y_neg_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_neg_fault' in the mesh file.
 label = 23
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -154,7 +109,6 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-0.6*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -163,35 +117,19 @@
 # ----------------------------------------------------------------------
 # Provide information on the fault (interface).
 [friction_shear_sliding.timedependent.interfaces]
-
 fault = pylith.faults.FaultCohesiveDyn
 
-# Define fault properties.
 [friction_shear_sliding.timedependent.interfaces.fault]
-
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
-
-# NOTE: It is possible to assign an ID number to a fault (e.g.,
-# 'id = 10').  Care must be taken when doing this, however, because the
-# assigned ID will become the material ID for the cohesive element.
-# This ID must not conflict with any of the material ID numbers for
-# volume elements.  The default ID for a fault is 100.  If you have a
-# fault in your mesh you must:
-# 1.  If you create your own fault ID, make sure it does not conflict
-#     with any of you material ID's.
-# 2.  If you use the default fault ID, make sure that none of your
-#     material ID's are equal to 100.
-
-# The quadrature for a 2D fault is 1D with a linear shape.
 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.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]

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_stick.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_stick.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/friction_shear_stick.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -24,15 +24,10 @@
 # ----------------------------------------------------------------------
 # mesh_generator
 # ----------------------------------------------------------------------
-# The settings below control the mesh generation (importing mesh info).
-# Turn on debugging output for mesh generation.
 [friction_shear_stick.mesh_generator]
 #debug = 1
 reader = pylith.meshio.MeshIOCubit
 
-# This component specification means we are using PyLith ASCII format,
-# and we then specify the filename and number of space dimensions for
-# the mesh.
 [friction_shear_stick.mesh_generator.reader]
 filename = mesh.exo
 use_nodeset_names = False
@@ -41,26 +36,17 @@
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-# Specify the problem settings.
-# This is a time-dependent problem, so we select this as our problem type.
-# We select a total time of 0 sec, and a time step size of 1 sec, so we
-# are performing a single time step.
-# The spatial dimension for this problem is 2.
-# For an implicit formulation (using implicit.cfg), we will perform 1
-# implicit time step from t = -1.0 to t = 0.0 (elastic solution step).
 [friction_shear_stick.timedependent]
 dimension = 2
 normalizer.length_scale = 1.0*m
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 3 boundary conditions: 'x_neg', 'x_pos_disp', 'x_pos_tract'
 bc = [x_neg,x_pos_disp,x_pos_tract,y_pos_fault,y_neg_fault]
 bc.x_pos_tract = pylith.bc.Neumann
 bc.y_pos_fault = pylith.bc.Neumann
 bc.y_neg_fault = pylith.bc.Neumann
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 [friction_shear_stick.timedependent.formulation.time_step]
@@ -71,22 +57,14 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [friction_shear_stick.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [friction_shear_stick.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
 label = elastic material
-
-# The cells associated with this material are given a material ID of 0
-# in the mesh file.
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matelastic2D.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
 # Set cell type to quadrilateral (2-d Lagrange).
@@ -96,33 +74,15 @@
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
-# Boundary conditions to be applied to the negative x-side of the mesh.
 [friction_shear_stick.timedependent.bc.x_neg]
-
-# We are fixing the 0 (x) and 1 (y) degrees of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_neg' in the mesh file.
 label = 21
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [friction_shear_stick.timedependent.bc.x_pos_disp]
-
-# We are fixing the 0 (x) degree of freedom.
 bc_dof = [0]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [friction_shear_stick.timedependent.bc.x_pos_tract]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -130,18 +90,11 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [1.0*MPa,0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
 
-
-
-# Boundary conditions to be applied to the positive y-side of the mesh.
 [friction_shear_stick.timedependent.bc.y_pos_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_pos_fault' in the mesh file.
 label = 22
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -149,15 +102,10 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-1.0*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
-# Boundary conditions to be applied to the negative y-side of the mesh.
 [friction_shear_stick.timedependent.bc.y_neg_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_neg_fault' in the mesh file.
 label = 23
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -165,7 +113,6 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-1.0*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -205,6 +152,7 @@
 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]

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformrigidbody.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformrigidbody.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformrigidbody.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -52,6 +52,7 @@
 [lgdeformrigidbody.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformtraction.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformtraction.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/lgdeformtraction.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -52,6 +52,7 @@
 [lgdeformtraction.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/sheardisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/sheardisp.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/sheardisp.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [sheardisp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_compression.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_compression.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_compression.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -40,10 +40,7 @@
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 3 boundary conditions: 'x_neg', 'y_neg' and 'x_pos'.
 bc = [x_neg,y_neg,x_pos]
-
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 
@@ -55,34 +52,22 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [slipweakening_compression.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [slipweakening_compression.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
-label = elastic material
-
-# The cells associated with this material are given a material ID of 1
-# in the mesh file.
+label = Elastic material
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matprops.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
-# Boundary conditions to be applied to the negative x-side of the mesh.
 [slipweakening_compression.timedependent.bc.x_neg]
 bc_dof = [0]
 label = 21
@@ -112,11 +97,8 @@
 
 # Define fault properties.
 [slipweakening_compression.timedependent.interfaces.fault]
-
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
 
-# The quadrature for a 2D fault is 1D with a linear shape.
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -126,6 +108,7 @@
 db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
 
 friction = pylith.friction.SlipWeakening
+friction.label = Slip-weakening friction
 
 friction.db_properties = spatialdata.spatialdb.UniformDB
 friction.db_properties.label = Slip weakening

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_opening.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_opening.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_opening.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -24,15 +24,10 @@
 # ----------------------------------------------------------------------
 # mesh_generator
 # ----------------------------------------------------------------------
-# The settings below control the mesh generation (importing mesh info).
-# Turn on debugging output for mesh generation.
 [slipweakening_opening.mesh_generator]
 #debug = 1
 reader = pylith.meshio.MeshIOCubit
 
-# This component specification means we are using PyLith ASCII format,
-# and we then specify the filename and number of space dimensions for
-# the mesh.
 [slipweakening_opening.mesh_generator.reader]
 filename = mesh.exo
 use_nodeset_names = False
@@ -41,24 +36,15 @@
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-# Specify the problem settings.
-# This is a time-dependent problem, so we select this as our problem type.
-# We select a total time of 0 sec, and a time step size of 1 sec, so we
-# are performing a single time step.
-# The spatial dimension for this problem is 2.
-# For an implicit formulation (using implicit.cfg), we will perform 1
-# implicit time step from t = -1.0 to t = 0.0 (elastic solution step).
 [slipweakening_opening.timedependent]
 dimension = 2
 normalizer.length_scale = 1.0*m
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 2 boundary conditions: 'x_neg', 'x_pos'
 bc = [x_neg,x_pos]
 bc.x_pos=pylith.bc.DirichletBoundary
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 
@@ -70,51 +56,30 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [slipweakening_opening.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [slipweakening_opening.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
 label = elastic material
-
-# The cells associated with this material are given a material ID of 0
-# in the mesh file.
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matelastic2D.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
 # Boundary conditions to be applied to the negative x-side of the mesh.
 [slipweakening_opening.timedependent.bc.x_neg]
-
-# We are fixing the 0 (x) and 1 (y) degree of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_neg' in the mesh file.
 label = 21
 
 # Boundary conditions to be applied to the positive x-side of the mesh.
 [slipweakening_opening.timedependent.bc.x_pos]
-
-# We are fixing the 1 (y) and prescribing 0 (x) degree of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -132,22 +97,7 @@
 
 # Define fault properties.
 [slipweakening_opening.timedependent.interfaces.fault]
-
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
-
-# NOTE: It is possible to assign an ID number to a fault (e.g.,
-# 'id = 10').  Care must be taken when doing this, however, because the
-# assigned ID will become the material ID for the cohesive element.
-# This ID must not conflict with any of the material ID numbers for
-# volume elements.  The default ID for a fault is 100.  If you have a
-# fault in your mesh you must:
-# 1.  If you create your own fault ID, make sure it does not conflict
-#     with any of you material ID's.
-# 2.  If you use the default fault ID, make sure that none of your
-#     material ID's are equal to 100.
-
-# The quadrature for a 2D fault is 1D with a linear shape.
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -157,6 +107,7 @@
 db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
 
 friction = pylith.friction.SlipWeakening
+friction.label = Slip-weakening friction
 
 friction.db_properties = spatialdata.spatialdb.UniformDB
 friction.db_properties.label = Slip weakening

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_sliding.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -24,15 +24,10 @@
 # ----------------------------------------------------------------------
 # mesh_generator
 # ----------------------------------------------------------------------
-# The settings below control the mesh generation (importing mesh info).
-# Turn on debugging output for mesh generation.
 [slipweakening_shear_sliding.mesh_generator]
 #debug = 1
 reader = pylith.meshio.MeshIOCubit
 
-# This component specification means we are using PyLith ASCII format,
-# and we then specify the filename and number of space dimensions for
-# the mesh.
 [slipweakening_shear_sliding.mesh_generator.reader]
 filename = mesh.exo
 use_nodeset_names = False
@@ -41,26 +36,17 @@
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-# Specify the problem settings.
-# This is a time-dependent problem, so we select this as our problem type.
-# We select a total time of 0 sec, and a time step size of 1 sec, so we
-# are performing a single time step.
-# The spatial dimension for this problem is 2.
-# For an implicit formulation (using implicit.cfg), we will perform 1
-# implicit time step from t = -1.0 to t = 0.0 (elastic solution step).
 [slipweakening_shear_sliding.timedependent]
 dimension = 2
 normalizer.length_scale = 1.0*m
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 2 boundary conditions: 'x_neg', 'x_pos'
 bc = [x_neg,x_pos,y_pos_fault,y_neg_fault]
 bc.x_pos = pylith.bc.DirichletBoundary
 bc.y_pos_fault = pylith.bc.Neumann
 bc.y_neg_fault = pylith.bc.Neumann
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 
@@ -72,51 +58,30 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [slipweakening_shear_sliding.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [slipweakening_shear_sliding.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
 label = elastic material
-
-# The cells associated with this material are given a material ID of 0
-# in the mesh file.
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matelastic2D.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
 # Boundary conditions to be applied to the negative x-side of the mesh.
 [slipweakening_shear_sliding.timedependent.bc.x_neg]
-
-# We are fixing the 0 (x) and 1 (y) degrees of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_neg' in the mesh file.
 label = 21
 
 # Boundary conditions to be applied to the positive x-side of the mesh.
 [slipweakening_shear_sliding.timedependent.bc.x_pos]
-
-# We are fixing the 0 (x) and prescribing 1 (y) degree of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -125,12 +90,8 @@
 db_initial.data = [0.0*m,1.0*m]
 
 
-
 # Boundary conditions to be applied to the positive y-side of the mesh.
 [slipweakening_shear_sliding.timedependent.bc.y_pos_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_pos_fault' in the mesh file.
 label = 22
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -138,15 +99,11 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-0.6*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
 # Boundary conditions to be applied to the negative y-side of the mesh.
 [slipweakening_shear_sliding.timedependent.bc.y_neg_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_neg_fault' in the mesh file.
 label = 23
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -154,36 +111,18 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-0.6*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
 # ----------------------------------------------------------------------
 # faults
 # ----------------------------------------------------------------------
-# Provide information on the fault (interface).
 [slipweakening_shear_sliding.timedependent.interfaces]
 
 fault = pylith.faults.FaultCohesiveDyn
 
-# Define fault properties.
 [slipweakening_shear_sliding.timedependent.interfaces.fault]
-
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
-
-# NOTE: It is possible to assign an ID number to a fault (e.g.,
-# 'id = 10').  Care must be taken when doing this, however, because the
-# assigned ID will become the material ID for the cohesive element.
-# This ID must not conflict with any of the material ID numbers for
-# volume elements.  The default ID for a fault is 100.  If you have a
-# fault in your mesh you must:
-# 1.  If you create your own fault ID, make sure it does not conflict
-#     with any of you material ID's.
-# 2.  If you use the default fault ID, make sure that none of your
-#     material ID's are equal to 100.
-
-# The quadrature for a 2D fault is 1D with a linear shape.
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -193,6 +132,7 @@
 db_initial_tractions.data = [0.0*Pa, -1.0*MPa]
 
 friction = pylith.friction.SlipWeakening
+friction.label = Slip-weakening friction
 
 friction.db_properties = spatialdata.spatialdb.UniformDB
 friction.db_properties.label = Slip weakening

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_stick.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_stick.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/quad4/slipweakening_shear_stick.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -24,15 +24,10 @@
 # ----------------------------------------------------------------------
 # mesh_generator
 # ----------------------------------------------------------------------
-# The settings below control the mesh generation (importing mesh info).
-# Turn on debugging output for mesh generation.
 [slipweakening_shear_stick.mesh_generator]
 #debug = 1
 reader = pylith.meshio.MeshIOCubit
 
-# This component specification means we are using PyLith ASCII format,
-# and we then specify the filename and number of space dimensions for
-# the mesh.
 [slipweakening_shear_stick.mesh_generator.reader]
 filename = mesh.exo
 use_nodeset_names = False
@@ -41,26 +36,17 @@
 # ----------------------------------------------------------------------
 # problem
 # ----------------------------------------------------------------------
-# Specify the problem settings.
-# This is a time-dependent problem, so we select this as our problem type.
-# We select a total time of 0 sec, and a time step size of 1 sec, so we
-# are performing a single time step.
-# The spatial dimension for this problem is 2.
-# For an implicit formulation (using implicit.cfg), we will perform 1
-# implicit time step from t = -1.0 to t = 0.0 (elastic solution step).
 [slipweakening_shear_stick.timedependent]
 dimension = 2
 normalizer.length_scale = 1.0*m
 formulation = pylith.problems.Implicit
 formulation.solver = pylith.problems.SolverNonlinear
 
-# Set bc to an array with 3 boundary conditions: 'x_neg', 'x_pos_disp', 'x_pos_tract'
 bc = [x_neg,x_pos_disp,x_pos_tract,y_pos_fault,y_neg_fault]
 bc.x_pos_tract = pylith.bc.Neumann
 bc.y_pos_fault = pylith.bc.Neumann
 bc.y_neg_fault = pylith.bc.Neumann
 
-# Set interfaces to an array with 1 fault: 'fault'.
 interfaces = [fault]
 
 [slipweakening_shear_stick.timedependent.formulation.time_step]
@@ -71,58 +57,31 @@
 # ----------------------------------------------------------------------
 # materials
 # ----------------------------------------------------------------------
-# Specify the material information for the problem.
-# The material type is isotropic elastic formulated for plane strain.
 [slipweakening_shear_stick.timedependent.materials]
 material = pylith.materials.ElasticPlaneStrain
 
 [slipweakening_shear_stick.timedependent.materials.material]
-
-# We give a label of 'elastic material' to this material.
 label = elastic material
-
-# The cells associated with this material are given a material ID of 0
-# in the mesh file.
 id = 1
 
-# The properties for this material are given in the spatial database file
-# 'matelastic2D.spatialdb'.
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 
-# Set cell type to quadrilateral (2-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 2
 
 # ----------------------------------------------------------------------
 # boundary conditions
 # ----------------------------------------------------------------------
-# Provide information on the boundary conditions.
-
-# Boundary conditions to be applied to the negative x-side of the mesh.
 [slipweakening_shear_stick.timedependent.bc.x_neg]
-
-# We are fixing the 0 (x) and 1 (y) degrees of freedom.
 bc_dof = [0,1]
-
-# The nodes associated with this boundary condition have the name
-# 'x_neg' in the mesh file.
 label = 21
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [slipweakening_shear_stick.timedependent.bc.x_pos_disp]
-
-# We are fixing the 0 (x) degree of freedom.
 bc_dof = [0]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
-# Boundary conditions to be applied to the positive x-side of the mesh.
 [slipweakening_shear_stick.timedependent.bc.x_pos_tract]
-
-# The nodes associated with this boundary condition have the name
-# 'x_pos' in the mesh file.
 label = 20
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -130,18 +89,11 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [1.0*MPa,0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
 
-
-
-# Boundary conditions to be applied to the positive y-side of the mesh.
 [slipweakening_shear_stick.timedependent.bc.y_pos_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_pos_fault' in the mesh file.
 label = 22
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -149,15 +101,10 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-1.0*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
-# Boundary conditions to be applied to the negative y-side of the mesh.
 [slipweakening_shear_stick.timedependent.bc.y_neg_fault]
-
-# The nodes associated with this boundary condition have the name
-# 'y_neg_fault' in the mesh file.
 label = 23
 
 db_initial = spatialdata.spatialdb.UniformDB
@@ -165,7 +112,6 @@
 db_initial.values = [traction-shear,traction-normal]
 db_initial.data = [-1.0*MPa, 0.0*MPa]
 
-# Set cell type to quadrilateral (1-d Lagrange).
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -179,24 +125,8 @@
 
 fault = pylith.faults.FaultCohesiveDyn
 
-# Define fault properties.
 [slipweakening_shear_stick.timedependent.interfaces.fault]
-
-# The nodes associated with this fault have the name 'fault' in the mesh file.
 label = 10
-
-# NOTE: It is possible to assign an ID number to a fault (e.g.,
-# 'id = 10').  Care must be taken when doing this, however, because the
-# assigned ID will become the material ID for the cohesive element.
-# This ID must not conflict with any of the material ID numbers for
-# volume elements.  The default ID for a fault is 100.  If you have a
-# fault in your mesh you must:
-# 1.  If you create your own fault ID, make sure it does not conflict
-#     with any of you material ID's.
-# 2.  If you use the default fault ID, make sure that none of your
-#     material ID's are equal to 100.
-
-# The quadrature for a 2D fault is 1D with a linear shape.
 quadrature.cell = pylith.feassemble.FIATLagrange
 quadrature.cell.dimension = 1
 
@@ -206,6 +136,7 @@
 db_initial_tractions.data = [0.0*Pa, -10.0*MPa]
 
 friction = pylith.friction.SlipWeakening
+friction.label = Slip weakening friction
 
 friction.db_properties = spatialdata.spatialdb.UniformDB
 friction.db_properties.label = Slip weakening

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/axialdisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/axialdisp.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/axialdisp.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [axialdisp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATSimplex
 quadrature.cell.shape = triangle

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -47,6 +47,7 @@
 [dislocation.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = triangle
 

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation2.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation2.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/dislocation2.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -47,6 +47,7 @@
 [dislocation2.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell.shape = triangle
 

Modified: short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/sheardisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/sheardisp.cfg	2011-07-11 18:18:23 UTC (rev 18726)
+++ short/3D/PyLith/branches/v1.6-stable/tests_auto/2d/tri3/sheardisp.cfg	2011-07-11 19:01:04 UTC (rev 18727)
@@ -49,6 +49,7 @@
 [sheardisp.timedependent.materials.elastic]
 label = Elastic material
 id = 1
+db_properties.label = Elastic properties
 db_properties.iohandler.filename = matprops.spatialdb
 quadrature.cell = pylith.feassemble.FIATSimplex
 quadrature.cell.shape = triangle



More information about the CIG-COMMITS mailing list