[cig-commits] r20012 - in short/3D/PyLith/branches/v1.7-trunk: examples/2d/subduction examples/3d/tet4 examples/bar_shearwave/tet4 examples/bar_shearwave/tri3 examples/twocells/twotet4 examples/twocells/twotet4-geoproj examples/twocells/twotri3 libsrc/pylith/feassemble playpen/faultfaces/test playpen/quadratic/twotet10 playpen/reordering pylith/feassemble tests/3d/plasticity/dynamic tests/3d/refine tests/3d/slipdir tests/refinefaulttip tests_auto/1d/line2 tests_auto/1d/line3 tests_auto/2d/tri3 tests_auto/2d/tri6 tests_auto/3d/tet4 tests_auto/3dnew/tet10 tests_auto/3dnew/tet4 unittests/pytests/bc unittests/pytests/faults unittests/pytests/feassemble unittests/pytests/materials unittests/pytests/meshio
brad at geodynamics.org
brad at geodynamics.org
Tue May 1 09:46:14 PDT 2012
Author: brad
Date: 2012-05-01 09:46:13 -0700 (Tue, 01 May 2012)
New Revision: 20012
Modified:
short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step01.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step02.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step03.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step03.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step04.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tet4/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc
short/3D/PyLith/branches/v1.7-trunk/playpen/faultfaces/test/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/playpen/reordering/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATLagrange.py
short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATSimplex.py
short/3D/PyLith/branches/v1.7-trunk/tests/3d/plasticity/dynamic/tet4.cfg
short/3D/PyLith/branches/v1.7-trunk/tests/3d/refine/tet4.cfg
short/3D/PyLith/branches/v1.7-trunk/tests/3d/slipdir/pylithapp.cfg
short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tet4.cfg
short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tri3.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensiondisp.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensionforce.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/lgdeformtranslation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/axialextension.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/axialdisp.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation2.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp_refine.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/axialdisp.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/axialelasticisotropic.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/shearelasticisotropic.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/axialdisp.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/dislocation.cfg
short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet4/axialdisp.cfg
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestFIATSimplex.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestMeshQuadrature.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestSubMeshQuadrature.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaterial.py
short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/meshio/TestCellFilterAvg.py
Log:
Switch FIATSimplex from shape to dimension for consistency with FIATLagrange.
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -76,7 +76,7 @@
# We are doing 2D quadrature for a triangle.
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# Continental mantle --------------------
@@ -91,7 +91,7 @@
# We are doing 2D quadrature for a triangle.
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# Oceanic crust --------------------
@@ -106,7 +106,7 @@
# We are doing 2D quadrature for a triangle.
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# Oceanic mantle --------------------
@@ -121,7 +121,7 @@
# We are doing 2D quadrature for a triangle.
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step01.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step01.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step01.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -96,7 +96,7 @@
# We must define the quadrature information for fault cells.
# The fault cells are 1D (line).
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# The slip time and final slip are defined in spatial databases.
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step02.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step02.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step02.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -85,7 +85,7 @@
# We must define the quadrature information for fault cells.
# The fault cells are 1D (line).
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# Switch to constant slip rate time function.
[pylithapp.timedependent.interfaces.fault_slabtop.eq_srcs.rupture]
@@ -113,7 +113,7 @@
# We must define the quadrature information for fault cells.
# The fault cells are 1D (line).
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# Switch to constant slip rate time function.
[pylithapp.timedependent.interfaces.fault_slabbot.eq_srcs.rupture]
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step03.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step03.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/2d/subduction/step03.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -85,7 +85,7 @@
# We must define the quadrature information for fault cells.
# The fault cells are 1D (line).
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# Set earthquake sources to an array consisting of creep and 3 ruptures.
eq_srcs = [creep,rupture]
@@ -130,7 +130,7 @@
# We must define the quadrature information for fault cells.
# The fault cells are 1D (line).
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# Switch to constant slip rate time function.
[pylithapp.timedependent.interfaces.fault_slabbot.eq_srcs.rupture]
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -78,7 +78,7 @@
db_properties.label = Elastic properties
db_properties.iohandler.filename = spatialdb/mat_elastic.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
[pylithapp.timedependent.materials.viscoelastic]
label = Viscoelastic material
@@ -86,7 +86,7 @@
db_properties.label = Viscoelastic properties
db_properties.iohandler.filename = spatialdb/mat_viscoelastic.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# PETSc
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step03.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step03.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step03.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -66,7 +66,7 @@
[pylithapp.timedependent.interfaces.fault]
label = fault
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
slip.label = Final slip
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step04.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step04.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/3d/tet4/step04.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -73,7 +73,7 @@
[pylithapp.timedependent.interfaces.fault]
label = fault
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
slip.label = Final slip
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tet4/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tet4/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tet4/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -105,7 +105,7 @@
# Set the basis functions and quadrature:
# 3-D simplex cell with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.quad_order = 2
[pylithapp.timedependent.materials.neg]
@@ -123,7 +123,7 @@
# Set the basis functions and quadrature:
# 3-D simplex cell with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.quad_order = 2
# ----------------------------------------------------------------------
@@ -142,7 +142,7 @@
# Specify the basis functions and quadrature:
# 2-D simplex cell in 3-D space with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
[pylithapp.timedependent.bc.x_neg]
@@ -158,7 +158,7 @@
# Specify the basis functions and quadrature:
# 2-D simplex cell in 3-D space with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
[pylithapp.timedependent.bc.all_nofault]
@@ -193,7 +193,7 @@
# Specify the basis functions and quadrature:
# 2-D simplex cell in 3-D space with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
# Switch to Brune slip time function
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/bar_shearwave/tri3/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -102,7 +102,7 @@
# Set the basis functions and quadrature:
# 2-D simplex cell with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
# ----------------------------------------------------------------------
@@ -121,7 +121,7 @@
# Specify the basis functions and quadrature:
# 1-D simplex cell in 2-D space with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.quad_order = 2
[pylithapp.timedependent.bc.x_neg]
@@ -137,7 +137,7 @@
# Specify the basis functions and quadrature:
# 1-D simplex cell in 2-D space with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.quad_order = 2
[pylithapp.timedependent.bc.all_nofault]
@@ -174,7 +174,7 @@
# Specify the basis functions and quadrature:
# 1-D simplex cell in 2-D space with 2nd order quadrature
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.quad_order = 2
# Switch to Brune slip time function
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -79,7 +79,7 @@
# material ID's are equal to 100.
# The quadrature for a 3D fault is 2D.
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# Give the spatial databases specifying the fault slip.
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -85,7 +85,7 @@
db_properties.iohandler.filename = matprops.spatialdb
# We are doing 3D quadrature for a tetrahedron.
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# PETSc
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -85,7 +85,7 @@
# mat_db.iohandler.filename = matprops.spatialdb
# The quadrature for a 3D fault is 2D.
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# Give the spatial databases specifying the fault slip.
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotet4-geoproj/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -90,7 +90,7 @@
# We are doing 3D quadrature for a tetrahedron.
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# PETSc
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -80,7 +80,7 @@
# for a fault is 100.
# The quadrature for a 2D fault is 1D with a linear shape.
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# Give the spatial databases specifying the fault slip.
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/examples/twocells/twotri3/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -84,7 +84,7 @@
db_properties.iohandler.filename = matprops.spatialdb
# We are doing 2D quadrature for a triangle.
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# PETSc
Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/feassemble/ElasticityExplicit.cc 2012-05-01 16:46:13 UTC (rev 20012)
@@ -338,7 +338,7 @@
// Numerical damping. Compute displacements adjusted by velocity
// times normalized viscosity.
- dispAdjCell = dispCell + _normViscosity*dt * velCell;
+ dispAdjCell = dispCell + viscosity * velCell;
// Compute B(transpose) * sigma, first computing strains
calcTotalStrainFn(&strainCell, basisDeriv, dispAdjCell,
Modified: short/3D/PyLith/branches/v1.7-trunk/playpen/faultfaces/test/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/playpen/faultfaces/test/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/playpen/faultfaces/test/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -76,21 +76,21 @@
id = 1
db_properties.iohandler.filename = mat_elastic.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
[pylithapp.timedependent.materials.elastic_middle]
label = Middle elastic material
id = 2
db_properties.iohandler.filename = mat_elastic.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
[pylithapp.timedependent.materials.elastic_right]
label = Rightmost elastic material
id = 3
db_properties.iohandler.filename = mat_elastic.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# faults
@@ -99,7 +99,7 @@
#label = f003
#id = 1003
#quadrature.cell = pylith.feassemble.FIATSimplex
-#quadrature.cell.shape = triangle
+#quadrature.cell.dimension = 2
#use_fault_mesh = True
#fault_mesh_filename = fault_surf_003a_1.inp
#output.vertex_info_fields = [normal_dir,strike_dir,dip_dir,final_slip_rupture,slip_time_rupture]
@@ -112,7 +112,7 @@
#label = f005
#id = 1005
#quadrature.cell = pylith.feassemble.FIATSimplex
-#quadrature.cell.shape = triangle
+#quadrature.cell.dimension = 2
#use_fault_mesh = True
#fault_mesh_filename = fault_surf_005a_1.inp
#output.vertex_info_fields = [normal_dir,strike_dir,dip_dir,final_slip_rupture,slip_time_rupture]
@@ -125,7 +125,7 @@
label = f003b
id = 1004
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
use_fault_mesh = True
fault_mesh_filename = fault_surf_003a_2.inp
output.vertex_info_fields = [normal_dir,strike_dir,dip_dir,final_slip_rupture,slip_time_rupture]
@@ -138,7 +138,7 @@
label = f003c
id = 1006
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
use_fault_mesh = True
fault_mesh_filename = fault_surf_003a_3.inp
output.vertex_info_fields = [normal_dir,strike_dir,dip_dir,final_slip_rupture,slip_time_rupture]
Modified: short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -79,7 +79,7 @@
# material ID's are equal to 100.
# The quadrature for a 3D fault is 2D.
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.degree = 2
# Give the spatial databases specifying the fault slip.
Modified: short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/playpen/quadratic/twotet10/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -84,7 +84,7 @@
db_properties.iohandler.filename = matprops.spatialdb
# We are doing 3D quadrature for a tetrahedron.
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.degree = 2
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/playpen/reordering/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/playpen/reordering/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/playpen/reordering/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -45,7 +45,7 @@
label = elastic material
id = 1
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATLagrange.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATLagrange.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATLagrange.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -32,7 +32,7 @@
def validateDimension(dim):
if dim < 1 or dim > 3:
- raise ValueError("Dimension of Lagrange element must be 1, 2, or 3.")
+ raise ValueError("Dimension of Lagrange cell must be 1, 2, or 3.")
return dim
Modified: short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATSimplex.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATSimplex.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/pylith/feassemble/FIATSimplex.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -27,17 +27,10 @@
import numpy
-def validateShape(shape):
- name = shape.lower()
- if not ("tetrahedron" == name or
- "triangle" == name or
- "line" == name or
- "point" == name):
- raise ValueError("Unknown shape '%s' for reference finite-element " \
- "cell.\n" \
- "Known shapes: 'tetrahedron', 'triangle', 'line', 'point'" % \
- name)
- return name
+def validateDimension(dim):
+ if dim < 1 or dim > 3:
+ raise ValueError("Dimension of simplex cell must be 1, 2, or 3.")
+ return dim
# FIATSimplex class
@@ -58,18 +51,19 @@
## Python object for managing FIATSimplex facilities and properties.
##
## \b Properties
- ## @li \b shape Shape of finite-element cell
+ ## @li \b dimension Dimension of finite-element cell.
## @li \b degree Degree of finite-element cell
## @li \b quad_order Order of quadrature rule
+ ## @li \b collocate_quad Collocate quadrature points with vertices.
##
## \b Facilities
## @li None
import pyre.inventory
- shape = pyre.inventory.str("shape", default="tetrahedron",
- validator=validateShape)
- shape.meta['tip'] = "Shape of finite-element cell."
+ dimension = pyre.inventory.int("dimension", default=3,
+ validator=validateDimension)
+ dimension.meta['tip'] = "Dimension of finite-element cell."
degree = pyre.inventory.int("degree", default=1)
degree.meta['tip'] = "Degree of finite-element cell."
@@ -97,7 +91,7 @@
"""
self._setupGeometry(spaceDim)
- if "point" == self.shape.lower():
+ if self.cellDim == 0:
# Need 0-D quadrature for boundary conditions of 1-D meshes
self.cellDim = 0
self.numCorners = 1
@@ -167,10 +161,11 @@
"""
try:
ReferenceCell._configure(self)
- self.shape = self.inventory.shape
+ self.cellDim = self.inventory.dimension
self.degree = self.inventory.degree
self.order = self.inventory.order
self.collocateQuad = self.inventory.collocateQuad
+
if self.order == -1:
self.order = self.degree
except ValueError, err:
@@ -228,23 +223,22 @@
import CellGeometry
self.geometry = None
- name = self.shape.lower()
- if "tetrahedron" == name:
+ if self.cellDim == 3:
if 3 == spaceDim:
self.geometry = CellGeometry.GeometryTet3D()
- elif "triangle" == name:
+ elif self.cellDim == 2:
if 2 == spaceDim:
self.geometry = CellGeometry.GeometryTri2D()
elif 3 == spaceDim:
self.geometry = CellGeometry.GeometryTri3D()
- elif "line" == name:
+ elif self.cellDim == 1:
if 1 == spaceDim:
self.geometry = CellGeometry.GeometryLine1D()
elif 2 == spaceDim:
self.geometry = CellGeometry.GeometryLine2D()
elif 3 == spaceDim:
self.geometry = CellGeometry.GeometryLine3D()
- elif "point" == name:
+ elif self.cellDim == 0:
if 1 == spaceDim:
self.geometry = CellGeometry.GeometryPoint1D()
elif 2 == spaceDim:
@@ -252,8 +246,8 @@
elif 3 == spaceDim:
self.geometry = CellGeometry.GeometryPoint3D()
if None == self.geometry:
- raise ValueError("Could not set shape '%s' of cell for '%s' in spatial " \
- "dimension '%s'." % (name, self.name, spaceDim))
+ raise ValueError("Could not set geometry of cell with dimension '%d' for '%s' in spatial " \
+ "dimension '%s'." % (self.cellDim, self.name, spaceDim))
return
@@ -295,20 +289,17 @@
Parse string into FIAT shape.
"""
from FIAT.reference_element import default_simplex
- name = self.shape.lower()
- if "tetrahedron" == name:
+ if self.cellDim == 3:
shape = default_simplex(3)
- elif "triangle" == name:
+ elif self.cellDim == 2:
shape = default_simplex(2)
- elif "line" == name:
+ elif self.cellDim == 1:
shape = default_simplex(1)
- elif "point" == name:
+ elif self.cellDim == 0:
shape = None
else:
- raise ValueError("Unknown shape '%s' for reference finite-element " \
- "cell.\n" \
- "Known shapes: 'tetrahedron', 'triangle', 'line'" % \
- name)
+ raise ValueError("Unknown dimension '%d' for reference finite-element " \
+ "cell.\n" % self.cellDim)
return shape
Modified: short/3D/PyLith/branches/v1.7-trunk/tests/3d/plasticity/dynamic/tet4.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests/3d/plasticity/dynamic/tet4.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests/3d/plasticity/dynamic/tet4.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -19,7 +19,7 @@
# ----------------------------------------------------------------------
[pylithapp.timedependent.materials.elastic]
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# End of file
Modified: short/3D/PyLith/branches/v1.7-trunk/tests/3d/refine/tet4.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests/3d/refine/tet4.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests/3d/refine/tet4.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -16,14 +16,14 @@
# ----------------------------------------------------------------------
[pylithapp.timedependent.materials.elastic]
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# faults
# ----------------------------------------------------------------------
[pylithapp.timedependent.interfaces.fault]
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# output
Modified: short/3D/PyLith/branches/v1.7-trunk/tests/3d/slipdir/pylithapp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests/3d/slipdir/pylithapp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests/3d/slipdir/pylithapp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -48,7 +48,7 @@
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# boundary conditions
@@ -73,7 +73,7 @@
label = fault
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
eq_srcs.rupture.slip_function = pylith.faults.StepSlipFn
Modified: short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tet4.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tet4.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tet4.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -69,7 +69,7 @@
db_properties.data = [2500.0*km/m**3, 5.1962*km/s, 3.0*km/s]
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.quad_order = 2
# ----------------------------------------------------------------------
@@ -95,7 +95,7 @@
id = 100
label = fault
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tri3.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tri3.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests/refinefaulttip/tri3.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -72,7 +72,7 @@
db_properties.data = [2500.0*km/m**3, 5.1962*km/s, 3.0*km/s]
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.quad_order = 2
# ----------------------------------------------------------------------
@@ -98,7 +98,7 @@
id = 100
label = fault
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.quad_order = 2
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -53,7 +53,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# ----------------------------------------------------------------------
# boundary conditions
@@ -73,7 +73,7 @@
[dislocation.timedependent.interfaces.fault]
label = fault
-quadrature.cell.shape = point
+quadrature.cell.dimension = 0
[dislocation.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
slip.label = Final slip
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensiondisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensiondisp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensiondisp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -51,7 +51,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensionforce.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensionforce.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/extensionforce.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -50,7 +50,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/lgdeformtranslation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/lgdeformtranslation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line2/lgdeformtranslation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -52,7 +52,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/axialextension.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/axialextension.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/axialextension.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -51,7 +51,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.degree = 2
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/1d/line3/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -51,7 +51,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.degree = 2
# ----------------------------------------------------------------------
@@ -72,7 +72,7 @@
[dislocation.timedependent.interfaces.fault]
label = fault
-quadrature.cell.shape = point
+quadrature.cell.dimension = 0
[dislocation.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
slip.label = Final slip
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/axialdisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/axialdisp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/axialdisp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -52,7 +52,7 @@
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -49,7 +49,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# boundary conditions
@@ -79,7 +79,7 @@
[dislocation.timedependent.interfaces.fault]
id = 2
label = 10
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
mat_db.iohandler.filename = matprops.spatialdb
[dislocation.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation2.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation2.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/dislocation2.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -49,7 +49,7 @@
id = 1
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# boundary conditions
@@ -72,7 +72,7 @@
[dislocation2.timedependent.interfaces.fault_pos]
id = 2
label = 11
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
mat_db.iohandler.filename = matprops.spatialdb
[dislocation2.timedependent.interfaces.fault_pos.eq_srcs.rupture.slip_function]
@@ -83,7 +83,7 @@
[dislocation2.timedependent.interfaces.fault_neg]
id = 3
label = 12
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
mat_db.iohandler.filename = matprops.spatialdb
[dislocation2.timedependent.interfaces.fault_neg.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -52,7 +52,7 @@
db_properties.label = Elastic properties
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp_refine.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp_refine.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri3/sheardisp_refine.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -56,7 +56,7 @@
id = 1
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/axialdisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/axialdisp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/axialdisp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -55,7 +55,7 @@
id = 1
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.degree = 2
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/2d/tri6/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -55,7 +55,7 @@
label = Elastic material
id = 1
db_properties.iohandler.filename = matprops.spatialdb
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.degree = 2
# ----------------------------------------------------------------------
@@ -86,7 +86,7 @@
[pylithapp.timedependent.interfaces.fault]
id = 2
label = fault_x
-quadrature.cell.shape = line
+quadrature.cell.dimension = 1
quadrature.cell.degree = 2
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/axialelasticisotropic.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/axialelasticisotropic.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/axialelasticisotropic.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -48,7 +48,7 @@
id = 1
db.iohandler.filename = matprops.spatialdb
quadrature = pylith.feassemble.quadrature.Quadrature3D
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -49,7 +49,7 @@
id = 0
db.iohandler.filename = matprops.spatialdb
quadrature = pylith.feassemble.quadrature.Quadrature3D
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# boundary conditions
@@ -76,7 +76,7 @@
id = 20
label = fault
quadrature = pylith.feassemble.quadrature.Quadrature2Din3D
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
mat_db.iohandler.filename = matprops.spatialdb
[pylithapp.timedependent.interfaces.fault.eq_src.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/shearelasticisotropic.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/shearelasticisotropic.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/3d/tet4/shearelasticisotropic.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -48,7 +48,7 @@
id = 1
db.iohandler.filename = matprops.spatialdb
quadrature = pylith.feassemble.quadrature.Quadrature3D
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/axialdisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/axialdisp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/axialdisp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -56,7 +56,7 @@
id = 1
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.degree= 2
[pylithapp.timedependent.materials.viscoelastic]
@@ -64,7 +64,7 @@
id = 2
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.degree= 2
# ----------------------------------------------------------------------
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/dislocation.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/dislocation.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet10/dislocation.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -57,7 +57,7 @@
id = 1
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.degree= 2
[pylithapp.timedependent.materials.viscoelastic]
@@ -65,7 +65,7 @@
id = 2
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
quadrature.cell.degree = 2
# ----------------------------------------------------------------------
@@ -97,7 +97,7 @@
id = 100
label = fault
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = triangle
+quadrature.cell.dimension = 2
quadrature.cell.degree= 2
[pylithapp.timedependent.interfaces.fault.eq_srcs.rupture.slip_function]
Modified: short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet4/axialdisp.cfg
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet4/axialdisp.cfg 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/tests_auto/3dnew/tet4/axialdisp.cfg 2012-05-01 16:46:13 UTC (rev 20012)
@@ -56,14 +56,14 @@
id = 1
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
[pylithapp.timedependent.materials.viscoelastic]
label = Elastic material 2
id = 2
db_properties.iohandler.filename = matprops.spatialdb
quadrature.cell = pylith.feassemble.FIATSimplex
-quadrature.cell.shape = tetrahedron
+quadrature.cell.dimension = 3
# ----------------------------------------------------------------------
# boundary conditions
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestAbsorbingDampers.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -189,7 +189,7 @@
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/bc/TestNeumann.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -187,7 +187,7 @@
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveDyn.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -259,7 +259,7 @@
# Setup quadrature
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/faults/TestFaultCohesiveKin.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -288,7 +288,7 @@
# Setup quadrature
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicit.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -229,7 +229,7 @@
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityExplicitLgDeform.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -229,7 +229,7 @@
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicit.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -213,7 +213,7 @@
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestElasticityImplicitLgDeform.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -213,7 +213,7 @@
# Setup material
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestFIATSimplex.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestFIATSimplex.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestFIATSimplex.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -518,15 +518,15 @@
from FIAT.reference_element import default_simplex
- cell.shape = "line"
+ cell.cellDim = 1
shape = cell._getShape()
self.assertEqual(default_simplex(1).get_shape(), shape.get_shape())
- cell.shape = "triangle"
+ cell.cellDim = 2
shape = cell._getShape()
self.assertEqual(default_simplex(2).get_shape(), shape.get_shape())
- cell.shape = "tetrahedron"
+ cell.cellDim = 3
shape = cell._getShape()
self.assertEqual(default_simplex(3).get_shape(), shape.get_shape())
return
@@ -537,7 +537,7 @@
Test initialize() with line2 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 1
cell.inventory.order = 1
cell._configure()
@@ -555,7 +555,7 @@
Test initialize() with line2 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 1
cell.inventory.order = 1
cell.inventory.collocateQuad = True
@@ -574,7 +574,7 @@
Test initialize() with line3 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 2
cell.inventory.order = 2
cell._configure()
@@ -592,7 +592,7 @@
Test initialize() with tri3 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 1
cell._configure()
cell.initialize(spaceDim=2)
@@ -609,7 +609,7 @@
Test initialize() with tri3 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 1
cell.inventory.collocateQuad = True
cell._configure()
@@ -627,7 +627,7 @@
Test initialize() with tri6 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell.inventory.degree = 2
cell._configure()
cell.initialize(spaceDim=2)
@@ -644,7 +644,7 @@
Test initialize() with tet4 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "tetrahedron"
+ cell.inventory.dimension = 3
cell.inventory.degree = 1
cell._configure()
cell.initialize(spaceDim=3)
@@ -661,7 +661,7 @@
Test initialize() with tet4 cell.
"""
cell = FIATSimplex()
- cell.inventory.shape = "tetrahedron"
+ cell.inventory.dimension = 3
cell.inventory.degree = 1
cell.inventory.collocateQuad = True
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestMeshQuadrature.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestMeshQuadrature.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestMeshQuadrature.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -88,7 +88,7 @@
Test initialize().
"""
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 2
cell.inventory.order = 2
cell._configure()
@@ -154,7 +154,7 @@
spaceDim = 1
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell._configure()
quadrature = MeshQuadrature()
@@ -175,7 +175,7 @@
spaceDim = 2
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell._configure()
quadrature = MeshQuadrature()
@@ -196,7 +196,7 @@
spaceDim = 3
cell = FIATSimplex()
- cell.inventory.shape = "tetrahedron"
+ cell.inventory.dimension = 3
cell._configure()
quadrature = MeshQuadrature()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestSubMeshQuadrature.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestSubMeshQuadrature.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/feassemble/TestSubMeshQuadrature.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -88,7 +88,7 @@
Test initialize().
"""
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 2
cell.inventory.order = 2
cell._configure()
@@ -154,7 +154,7 @@
spaceDim = 2
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell._configure()
quadrature = SubMeshQuadrature()
@@ -175,7 +175,7 @@
spaceDim = 3
cell = FIATSimplex()
- cell.inventory.shape = "triangle"
+ cell.inventory.dimension = 2
cell._configure()
quadrature = SubMeshQuadrature()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaterial.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaterial.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/materials/TestMaterial.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -141,7 +141,7 @@
"""
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.order = 1
cell.inventory.degree = 1
cell._configure()
Modified: short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/meshio/TestCellFilterAvg.py
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/meshio/TestCellFilterAvg.py 2012-05-01 14:58:16 UTC (rev 20011)
+++ short/3D/PyLith/branches/v1.7-trunk/unittests/pytests/meshio/TestCellFilterAvg.py 2012-05-01 16:46:13 UTC (rev 20012)
@@ -49,7 +49,7 @@
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 2
cell.inventory.order = 2
cell._configure()
@@ -99,7 +99,7 @@
from pylith.feassemble.FIATSimplex import FIATSimplex
cell = FIATSimplex()
- cell.inventory.shape = "line"
+ cell.inventory.dimension = 1
cell.inventory.degree = 2
cell.inventory.order = 2
cell._configure()
More information about the CIG-COMMITS
mailing list