[cig-commits] [commit] devel: Merge branch 'devel' of https://github.com/geodynamics/specfem3d into devel (6026e36)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/6026e367984905ab133865f62fa6293b343759b9...47f703851338234f96397e7da9fbff63d8178b8a

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

commit 6026e367984905ab133865f62fa6293b343759b9
Merge: f85e215 ba49c5d
Author: CIG Backend <emheien at ucdavis.edu>
Date:   Wed Jun 18 21:06:28 2014 +0000

    Merge branch 'devel' of https://github.com/geodynamics/specfem3d into devel



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

6026e367984905ab133865f62fa6293b343759b9
 README_SPECFEM3D_FAULT                             | 381 ++++++++-------------
 src/generate_databases/create_mass_matrices.f90    |  10 +-
 .../pml_set_local_dampingcoeff.f90                 | 110 +++---
 3 files changed, 207 insertions(+), 294 deletions(-)