[cig-commits] r16935 - in short/3D/PyLith/trunk: . doc/releasenotes examples examples/twocells/twoquad4 examples/twocells/twotet4 examples/twocells/twotet4-geoproj libsrc/feassemble modulesrc/faults modulesrc/problems tests_auto/1d/line2 tests_auto/2d/quad4 tests_auto/2d/tri3 tests_auto/petsc unittests/libtests/faults unittests/libtests/friction unittests/pytests/faults unittests/pytests/faults/data unittests/pytests/feassemble
brad at geodynamics.org
brad at geodynamics.org
Tue Jun 8 11:24:22 PDT 2010
Author: brad
Date: 2010-06-08 11:24:22 -0700 (Tue, 08 Jun 2010)
New Revision: 16935
Removed:
short/3D/PyLith/trunk/tests_auto/2d/tri3/TestAxialPlaneStrain.py
Modified:
short/3D/PyLith/trunk/Makefile.am
short/3D/PyLith/trunk/configure.ac
short/3D/PyLith/trunk/doc/releasenotes/Makefile.am
short/3D/PyLith/trunk/examples/run_examples.sh
short/3D/PyLith/trunk/examples/twocells/twoquad4/axialtract.cfg
short/3D/PyLith/trunk/examples/twocells/twoquad4/twoquad4.mesh
short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/twotet4.mesh
short/3D/PyLith/trunk/examples/twocells/twotet4/twotet4.mesh
short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am
short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
short/3D/PyLith/trunk/modulesrc/problems/Makefile.am
short/3D/PyLith/trunk/tests_auto/1d/line2/Makefile.am
short/3D/PyLith/trunk/tests_auto/2d/quad4/Makefile.am
short/3D/PyLith/trunk/tests_auto/petsc/Makefile.am
short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am
short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am
short/3D/PyLith/trunk/unittests/pytests/faults/Makefile.am
short/3D/PyLith/trunk/unittests/pytests/faults/data/Makefile.am
short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
Log:
More cleanup of Makefiles and fixing of examples parameters.
Modified: short/3D/PyLith/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -26,7 +26,10 @@
tests_auto
endif
-DIST_SUBDIRS = $(SUBDIRS) examples tests_auto tests doc
+DIST_SUBDIRS = $(SUBDIRS) \
+ examples \
+ tests \
+ doc
if ENABLE_DOCUMENTATION
SUBDIRS += doc
Modified: short/3D/PyLith/trunk/configure.ac
===================================================================
--- short/3D/PyLith/trunk/configure.ac 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/configure.ac 2010-06-08 18:24:22 UTC (rev 16935)
@@ -293,6 +293,8 @@
tests_auto/3dnew/hex8/Makefile
tests_auto/petsc/Makefile
tests/Makefile
+ tests/3d/Makefile
+ tests/3d/matprops/Makefile
playpen/closure/Makefile
doc/Makefile
doc/developer/Makefile
@@ -307,6 +309,7 @@
examples/twocells/Makefile
examples/3d/tet4/Makefile
examples/3d/hex8/Makefile
+ examples/3d/hex8/output/Makefile
examples/bar_shearwave/hex8/Makefile
examples/bar_shearwave/hex8/output/Makefile
examples/bar_shearwave/quad4/Makefile
Modified: short/3D/PyLith/trunk/doc/releasenotes/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/doc/releasenotes/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/doc/releasenotes/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -18,6 +18,7 @@
announce_v1.3.0.txt \
announce_v1.3.1.txt \
announce_v1.4.0.txt \
+ announce_v1.4.2.txt \
announce_v1.5.0.txt
Modified: short/3D/PyLith/trunk/examples/run_examples.sh
===================================================================
--- short/3D/PyLith/trunk/examples/run_examples.sh 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/examples/run_examples.sh 2010-06-08 18:24:22 UTC (rev 16935)
@@ -5,7 +5,7 @@
examples_dir=`pwd`
-# Run specified list of examples
+# Run specified list of examples (single .cfg file)
run_examples() {
cd ${examples_dir}/$dir
rm *.vtk
@@ -16,6 +16,18 @@
done
}
+# Run specified list of examples (additional common .cfg files)
+run_examples2() {
+ commoncfg=$1
+ cd ${examples_dir}/$dir
+ rm *.vtk
+ if [ -d output ]; then rm output/*.vtk; fi
+ for example in $examples; do
+ echo "RUNNING $dir/$example"
+ pylith $commoncfg $example
+ done
+}
+
# ----------------------------------------------------------------------
# twotri3
dir="twocells/twotri3"
@@ -50,7 +62,7 @@
# 3d/hex8
dir="3d/hex8"
-examples="shearxy.cfg dislocation.cfg gravity.cfg gravity_istress.cfg savageprescott.cfg"
+examples="step01 step02 step03 step04 step05 step06 step07 step08 step09 step10 step11 step12 step13 step14 step15 step16 step17"
run_examples
# ----------------------------------------------------------------------
@@ -61,8 +73,10 @@
# bar_shearwave/quad4
dir="bar_shearwave/quad4"
-examples="pylithapp.cfg"
+examples="kinematic.cfg"
run_examples
+examples="dynamic_staticfriction.cfg dynamic_slipweakening.cfg dynamic_ratestateageing.cfg"
+run_examples2 "dynamic.cfg"
# bar_shearwave/tet4
dir="bar_shearwave/tet4"
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/axialtract.cfg
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/axialtract.cfg 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/axialtract.cfg 2010-06-08 18:24:22 UTC (rev 16935)
@@ -115,8 +115,8 @@
bc_dof = [1]
# The group of vertices in the mesh file associated with this boundary
-# condition have the name 'y_neg'.
-label = y_neg
+# condition have the name 'y_neg_nofault'.
+label = y_neg_nofault
# ----------------------------------------------------------------------
# faults
Modified: short/3D/PyLith/trunk/examples/twocells/twoquad4/twoquad4.mesh
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twoquad4/twoquad4.mesh 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/examples/twocells/twoquad4/twoquad4.mesh 2010-06-08 18:24:22 UTC (rev 16935)
@@ -97,6 +97,19 @@
}
// This group of vertices may be used to specify boundary conditions.
+ // This group does not contain any vertices on the fault.
+ // There are 3 vertices corresponding to indices 0, 4.
+ group = {
+ name = y_neg_nofault
+ type = vertices
+ count = 2
+ indices = {
+ 0
+ 4
+ }
+ }
+
+ // This group of vertices may be used to specify boundary conditions.
// There are 2 vertices corresponding to indices 0 and 1.
group = {
name = x_neg
Modified: short/3D/PyLith/trunk/examples/twocells/twotet4/twotet4.mesh
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotet4/twotet4.mesh 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/examples/twocells/twotet4/twotet4.mesh 2010-06-08 18:24:22 UTC (rev 16935)
@@ -99,7 +99,7 @@
// This group of vertices may be used to specify boundary conditions.
// There are 2 vertices corresponding to indices 2, 4.
group = {
- name = edge 1
+ name = edge 2
type = vertices
count = 2
indices = {
Modified: short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/twotet4.mesh
===================================================================
--- short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/twotet4.mesh 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/examples/twocells/twotet4-geoproj/twotet4.mesh 2010-06-08 18:24:22 UTC (rev 16935)
@@ -99,7 +99,7 @@
// This group of vertices may be used to specify boundary conditions.
// There are 2 vertices corresponding to indices 2, 4.
group = {
- name = edge 1
+ name = edge 2
type = vertices
count = 2
indices = {
Modified: short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/libsrc/feassemble/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -66,6 +66,14 @@
noinst_HEADERS =
+dist_noinst_DATA = \
+ jacobian2d_lgdeform.wxm \
+ jacobian2d_nonsymm_lgdeform.wxm \
+ jacobian3d_lgdeform.wxm \
+ jacobian3d_nonsymm_lgdeform.wxm \
+ tri3_elasticity.wxm \
+ tet4_elasticity.wxm
+
# export
clean-local: clean-subpkgincludeHEADERS
BUILT_SOURCES = export-subpkgincludeHEADERS
Modified: short/3D/PyLith/trunk/modulesrc/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/faults/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/modulesrc/faults/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -24,6 +24,7 @@
StepSlipFn.i \
BruneSlipFn.i \
LiuCosSlipFn.i \
+ TimeHistorySlipFn.i \
EqKinSrc.i \
Fault.i \
FaultCohesive.i \
Modified: short/3D/PyLith/trunk/modulesrc/problems/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/problems/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/modulesrc/problems/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -24,7 +24,8 @@
Implicit.i \
Solver.i \
SolverLinear.i \
- SolverNonlinear.i
+ SolverNonlinear.i \
+ SolverLumped.i
swig_generated = \
Modified: short/3D/PyLith/trunk/tests_auto/1d/line2/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/tests_auto/1d/line2/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/tests_auto/1d/line2/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -30,7 +30,8 @@
extensionforce_force.spatialdb \
dislocation.cfg \
finalslip.spatialdb \
- sliptime.spatialdb
+ sliptime.spatialdb \
+ lgdeformtranslation.cfg
noinst_TMP = \
extensiondisp_t0000000.vtk \
Modified: short/3D/PyLith/trunk/tests_auto/2d/quad4/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/quad4/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/tests_auto/2d/quad4/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -23,6 +23,7 @@
sheardisp_soln.py \
sheardisp_gendb.py \
TestDislocation.py \
+ TestDislocation2.py \
dislocation_soln.py \
dislocation2_soln.py \
TestLgDeformRigidBody.py \
Deleted: short/3D/PyLith/trunk/tests_auto/2d/tri3/TestAxialPlaneStrain.py
===================================================================
--- short/3D/PyLith/trunk/tests_auto/2d/tri3/TestAxialPlaneStrain.py 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/tests_auto/2d/tri3/TestAxialPlaneStrain.py 2010-06-08 18:24:22 UTC (rev 16935)
@@ -1,179 +0,0 @@
-#!/usr/bin/env python
-#
-# ----------------------------------------------------------------------
-#
-# Brad T. Aagaard
-# U.S. Geological Survey
-#
-# <LicenseText>
-#
-# ----------------------------------------------------------------------
-#
-
-## @file tests/2d/tri3/TestAxialPlaneStrain.py
-##
-## @brief Test suite for testing pylith with axial compression in
-## y-direction for 2-D box.
-
-import unittest
-import numpy
-from pylith.utils.VTKDataReader import has_vtk
-from pylith.utils.VTKDataReader import VTKDataReader
-
-# Local version of PyLithApp
-from pylith.apps.PyLithApp import PyLithApp
-class AxialPlaneStrainApp(PyLithApp):
- def __init__(self):
- PyLithApp.__init__(self, name="axialplanestrain")
- return
-
-
-# Helper function to run PyLith
-def run_pylith():
- """
- Run pylith.
- """
- if not "done" in dir(run_pylith):
- app = AxialPlaneStrainApp()
- app.run()
- run_pylith.done = True
- return
-
-
-class TestAxialPlaneStrain(unittest.TestCase):
- """
- Test suite for testing pylith with axial extension in y-direction
- for 2-D box.
- """
-
- def setUp(self):
- """
- Setup for test.
- """
- run_pylith()
- if has_vtk():
- self.reader = VTKDataReader()
- else:
- self.reader = None
- return
-
-
- def test_elastic_info(self):
- """
- Check elastic info.
- """
- if self.reader is None:
- return
-
- data = self.reader.read("axialplanestrain-statevars-elastic_info.vtk")
-
- # Check cells
- ncellsE = 84
- ncornersE = 3
- (ncells, ncorners) = data['cells'].shape
- self.assertEqual(ncellsE, ncells)
- self.assertEqual(ncornersE, ncorners)
-
- # Check vertices
- nverticesE = 54
- spaceDimE = 3
- (nvertices, spaceDim) = data['vertices'].shape
- self.assertEqual(nverticesE, nvertices)
- self.assertEqual(spaceDimE, spaceDim)
-
- # Check physical properties
- tolerance = 1.0e-5
- vsE = 3000.0
- vpE = 5291.502622129181
- densityE = 2500.0
-
- # Lame's constant mu (shear modulus)
- muE = densityE*vsE**2
- diff = numpy.abs(1.0 - data['cell_fields']['mu']/muE)
- okay = diff < tolerance
- if numpy.sum(okay) != ncells:
- print "Lame's constant mu: ",data['cell_fields']['mu']
- self.assertEqual(ncells, numpy.sum(okay))
-
- # Lame's constant lambda
- lambdaE = densityE*vpE**2 - 2*muE
- diff = numpy.abs(1.0 - data['cell_fields']['lambda']/lambdaE)
- okay = diff < tolerance
- if numpy.sum(okay) != ncells:
- print "Lame's constant lambda: ",data['cell_fields']['lambda']
- self.assertEqual(ncells, numpy.sum(okay))
-
- # Density
- diff = numpy.abs(1.0 - data['cell_fields']['density']/densityE)
- okay = diff < tolerance
- if numpy.sum(okay) != ncells:
- print "Density: ",data['cell_fields']['density']
- self.assertEqual(ncells, numpy.sum(okay))
- return
-
-
- def test_soln(self):
- """
- Check solution (displacement) field.
- """
- if self.reader is None:
- return
-
- data = self.reader.read("axialplanestrain_t0000000.vtk")
-
- # Check cells
- ncellsE = 84
- ncornersE = 3
- (ncells, ncorners) = data['cells'].shape
- self.assertEqual(ncellsE, ncells)
- self.assertEqual(ncornersE, ncorners)
-
- # Check vertices
- nverticesE = 54
- spaceDimE = 3
- vertices = data['vertices']
- (nvertices, spaceDim) = vertices.shape
- self.assertEqual(nverticesE, nvertices)
- self.assertEqual(spaceDimE, spaceDim)
-
- # Check displacement solution
- tolerance = 1.0e-5
- dispE = numpy.zeros( (nvertices, spaceDim), dtype=numpy.float64)
- dispE[:,1] = -0.004 * vertices[:,1]
-
- disp = data['vertex_fields']['displacements']
-
- # Check x displacements
- diff = numpy.abs(disp[:,0] - dispE[:,0])
- okay = diff < tolerance
- if numpy.sum(okay) != nvertices:
- print "Displacement field: ",disp
- self.assertEqual(nvertices, numpy.sum(okay))
-
- # Check y displacements
- mask = dispE[:,1] > 0.0
- diff = mask * numpy.abs(1.0 - disp[:,1] / dispE[:,1]) + \
- ~mask * numpy.abs(disp[:,1] - dispE[:,1])
- okay = diff < tolerance
- if numpy.sum(okay) != nvertices:
- print "Displacement field: ",disp
- self.assertEqual(nvertices, numpy.sum(okay))
-
- # Check z displacements
- diff = numpy.abs(disp[:,2] - dispE[:,2])
- okay = diff < tolerance
- if numpy.sum(okay) != nvertices:
- print "Displacement field: ",disp
- self.assertEqual(nvertices, numpy.sum(okay))
-
- return
-
-
- def test_elastic_statevars(self):
- """
- Check elastic state variables.
- """
- return
-
-
-# End of file
Modified: short/3D/PyLith/trunk/tests_auto/petsc/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/tests_auto/petsc/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/tests_auto/petsc/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -12,10 +12,10 @@
TESTS = testpetsc.py
-check_SCRIPTS = testpetsc.py
+dist_check_SCRIPTS = testpetsc.py
dist_noinst_PYTHON = \
- TestPetscApp.py
+ TestPetscApp.py
noinst_DATA =
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -56,6 +56,7 @@
noinst_HEADERS = \
TestBruneSlipFn.hh \
+ TestLiuCosSlipFn.hh \
TestTimeHistorySlipFn.hh \
TestConstRateSlipFn.hh \
TestStepSlipFn.hh \
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -28,7 +28,7 @@
TestRateStateAgeing.cc
-noinst_HEADERS =
+noinst_HEADERS = \
TestFrictionModel.hh \
TestStaticFriction.hh \
TestSlipWeakening.hh \
Modified: short/3D/PyLith/trunk/unittests/pytests/faults/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/faults/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/unittests/pytests/faults/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -25,6 +25,7 @@
TestConstRateSlipFn.py \
TestEqKinSrc.py \
TestFaultCohesiveKin.py \
+ TestFaultCohesiveDyn.py \
TestLiuCosSlipFn.py \
TestSingleRupture.py \
TestStepSlipFn.py \
Modified: short/3D/PyLith/trunk/unittests/pytests/faults/data/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/faults/data/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/unittests/pytests/faults/data/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -17,7 +17,8 @@
tri3_sliptime.spatialdb \
tri3_peakrate.spatialdb \
tri3_initialtractions.spatialdb \
- tri3_staticfriction.spatialdb
+ tri3_staticfriction.spatialdb \
+ slipfn.timedb
noinst_TMP =
Modified: short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am 2010-06-08 17:37:46 UTC (rev 16934)
+++ short/3D/PyLith/trunk/unittests/pytests/feassemble/Makefile.am 2010-06-08 18:24:22 UTC (rev 16935)
@@ -27,7 +27,9 @@
TestMeshQuadrature.py \
TestSubMeshQuadrature.py \
TestElasticityExplicit.py \
- TestElasticityImplicit.py
+ TestElasticityImplicit.py \
+ TestElasticityExplicitLgDeform.py \
+ TestElasticityImplicitLgDeform.py
# End of file
More information about the CIG-COMMITS
mailing list