[cig-commits] [commit] devel: Merge branch 'devel' of github.com:xiezhinan/specfem3d into devel (e6a0ddf)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/f316cd07c78df8dab2d8fe8e063750d968439f66...e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718

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

commit e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718
Merge: f316cd0 e676e9d
Author: buildbot <buildbot at seismobot.Princeton.EDU>
Date:   Sat Jun 21 03:36:43 2014 -0400

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



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

e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718
 src/specfem3D/compute_coupling_viscoelastic_ac.f90 |   10 +-
 src/specfem3D/compute_forces_acoustic_noDev.f90    |   25 +-
 ...compute_forces_viscoelastic_calling_routine.F90 |    6 +-
 .../compute_forces_viscoelastic_noDev.f90          |   62 +-
 src/specfem3D/finalize_simulation.f90              |   14 +
 src/specfem3D/initialize_simulation.f90            |    2 -
 src/specfem3D/pml_allocate_arrays.f90              |   60 ++
 src/specfem3D/pml_compute_accel_contribution.f90   | 1020 ++++++++++++--------
 src/specfem3D/pml_compute_memory_variables.f90     |  902 ++++++++---------
 src/specfem3D/pml_par.f90                          |   37 +-
 src/specfem3D/update_displacement_scheme.f90       |   34 +-
 11 files changed, 1227 insertions(+), 945 deletions(-)