[cig-commits] [commit] devel: Merge pull request #118 from xiezhinan/devel (2e2f304)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem2d/compare/1e74fc10b34d28f5c1879591f5c7c639e72fa24c...2e2f3047c3b54ead260dc80b055ddab66a20bb01

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

commit 2e2f3047c3b54ead260dc80b055ddab66a20bb01
Merge: 1e74fc1 64a2a90
Author: Dimitri Komatitsch <komatits at users.noreply.github.com>
Date:   Sat Aug 9 15:24:43 2014 +0200

    Merge pull request #118 from xiezhinan/devel
    
    Add the new PML formulation for fluid-solid simulation



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

2e2f3047c3b54ead260dc80b055ddab66a20bb01
 src/specfem2D/Makefile.in                          |   3 +
 ...el.f90 => compute_coupling_viscoelastic_ac.f90} | 133 ++++++++++++---------
 src/specfem2D/specfem2D.F90                        | 127 +++-----------------
 3 files changed, 94 insertions(+), 169 deletions(-)