[cig-commits] [commit] devel: Merge pull request #165 from xiezhinan/devel (162be97)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/ef9ac842da149d304509657da0cb3da09614bf63...162be97e5d1637f332135862c22a5383ed79880c

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

commit 162be97e5d1637f332135862c22a5383ed79880c
Merge: ef9ac84 e879ce3
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Wed Jun 18 12:18:11 2014 +0200

    Merge pull request #165 from xiezhinan/devel
    
    add a more flexible function for scale factor and fix one error in create_mass_matrices.f90



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

162be97e5d1637f332135862c22a5383ed79880c
 src/generate_databases/create_mass_matrices.f90    |  10 +-
 .../pml_set_local_dampingcoeff.f90                 | 110 ++++++++++-----------
 2 files changed, 60 insertions(+), 60 deletions(-)