[cig-commits] [commit] master: Fixed makefiles for 3-D plasticity test. (192c608)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith

On branch  : master
Link       : https://github.com/geodynamics/pylith/compare/62d706613047bb2e420be5294fd3d72016c02c51...1d7550d853e7269ae2c039f38f58f9436ed11d00

>---------------------------------------------------------------

commit 192c60856fd9382d926e868e4b4f2f058d4e27d9
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Wed Nov 19 08:15:39 2014 -0800

    Fixed makefiles for 3-D plasticity test.


>---------------------------------------------------------------

192c60856fd9382d926e868e4b4f2f058d4e27d9
 configure.ac                                  |  2 +-
 tests/3d/plasticity/Makefile.am               |  5 ++---
 tests/3d/plasticity/initialstress/Makefile.am | 24 +++++++++++++++++++-----
 tests/3d/plasticity/initialstress/README      | 14 ++++++++++++++
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index adbb37d..55eee18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -360,6 +360,7 @@ AC_CONFIG_FILES([Makefile
 		tests/3d/plasticity/threehex8/results/Makefile
 		tests/3d/plasticity/threehex8/spatialdb/Makefile
 		tests/3d/plasticity/dynamic/Makefile
+		tests/3d/plasticity/initialstress/Makefile
 		tests/topology/Makefile
 		tests/refinefaulttip/Makefile
                 doc/Makefile
@@ -379,7 +380,6 @@ AC_CONFIG_FILES([Makefile
 		examples/2d/subduction/Makefile
 		examples/2d/subduction/output/Makefile
 		examples/2d/gravity/Makefile
-		examples/2d/gravity/output/Makefile
 		examples/2d/greensfns/Makefile
 		examples/2d/greensfns/strikeslip/Makefile
 		examples/2d/greensfns/strikeslip/output/Makefile
diff --git a/tests/3d/plasticity/Makefile.am b/tests/3d/plasticity/Makefile.am
index ad61b63..c34298b 100644
--- a/tests/3d/plasticity/Makefile.am
+++ b/tests/3d/plasticity/Makefile.am
@@ -18,8 +18,7 @@
 
 SUBDIRS = \
 	threehex8 \
-	dynamic
-
-#	initialstress
+	dynamic \
+	initialstress
 
 # End of file 
diff --git a/tests/3d/plasticity/initialstress/Makefile.am b/tests/3d/plasticity/initialstress/Makefile.am
index eeabb99..7c31454 100644
--- a/tests/3d/plasticity/initialstress/Makefile.am
+++ b/tests/3d/plasticity/initialstress/Makefile.am
@@ -16,10 +16,24 @@
 # ----------------------------------------------------------------------
 #
 
-SUBDIRS = \
-	config \
-	mesh \
-	output \
-	spatialdb
+dist_noinst_DATA = \
+	README \
+	runtests.sh \
+	plot_invars.py \
+	mesh.jou \
+	mesh_hex8.exo \
+	pylithapp.cfg \
+	elastic.cfg \
+	elastic_dt01.cfg \
+	elastic_dt02.cfg \
+	elastic_dt05.cfg \
+	elastic_dt10.cfg \
+	plastic.cfg \
+	plastic_dt01.cfg \
+	plastic_dt02.cfg \
+	plastic_dt05.cfg \
+	plastic_dt10.cfg \
+	simpleshear_velbc.spatialdb
+
 
 # End of file 
diff --git a/tests/3d/plasticity/initialstress/README b/tests/3d/plasticity/initialstress/README
new file mode 100644
index 0000000..30adf17
--- /dev/null
+++ b/tests/3d/plasticity/initialstress/README
@@ -0,0 +1,14 @@
+Test of Drucker-Prager plasticity using initial stresses and different
+time step sizes.
+
+A cube with initial hydrostatic pressure is subjected to simple shear
+with a given loading rate. Plastic yield should occur at t = 10 years,
+and should continue afterwards.
+
+Execute the bash script runtest.sh to run both elastic and plastic models with
+different time step sizes. The script then executes the plot_invars.py
+Python script (requires h5py, numpy, and matplotlib). The left-hand plot is
+the second plastic strain invariant as a function of time (should be zero
+until t = 10 years). The right-hand plot shows the second deviatoric stress
+invariant for both the elastic and plastic cases. They should be identical
+until t = 10 years, at which point the plastic stresses will be less.
\ No newline at end of file