[cig-commits] [commit] williams/add-examples-grav2d: Merge branch 'williams/add-examples-grav2d' of github.com:geodynamics/pylith into williams/add-examples-grav2d (5edff1f)

[cig_noreply at geodynamics.org]

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

On branch  : williams/add-examples-grav2d
Link       : https://github.com/geodynamics/pylith/compare/f33c75b19fd60eedb2a3405db76a1fee333bb1d7...5b6d812b1612809fea3bd331c4e5af98c25a536a

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

commit 5edff1f5bb65e4a40bad97438094803e8491bcd1
Merge: 7871d05 bed3e7e
Author: Charles Williams <C.Williams at gns.cri.nz>
Date:   Sat Jun 28 05:27:52 2014 +1200

    Merge branch 'williams/add-examples-grav2d' of github.com:geodynamics/pylith into williams/add-examples-grav2d



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

5edff1f5bb65e4a40bad97438094803e8491bcd1
 examples/2d/gravity/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --cc examples/2d/gravity/Makefile.am
index 0612a0d,2e5752a..4354644
--- a/examples/2d/gravity/Makefile.am
+++ b/examples/2d/gravity/Makefile.am
@@@ -21,18 -21,12 +21,17 @@@ dist_noinst_DATA = 
  	geometry.jou \
  	grav_stress-initial.spatialdb \
  	grav_stress.cfg \
 +	grav_stress_finite_nois.cfg \
 +	grav_stress_finite_is1.cfg \
  	grav_stress_finite_is2.cfg \
 +	grav_stress_finite_is3.cfg \
 +	grav_stress_infin_nois.cfg \
  	grav_stress_infin_is1.cfg \
  	grav_stress_infin_is2.cfg \
 +	grav_stress_infin_is3.cfg \
  	mat_elastic.spatialdb \
  	mat_maxwell.spatialdb \
- 	mesh_tri3.exo \
- 	mesh_tri3.jou \
+ 	mesh.jou \
  	pylithapp.cfg \
  	stress2spatialdb.py