[cig-commits] [commit] devel: Updated for coupling with DSM (d8ee135)

[cig_noreply at geodynamics.org]

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

On branch  : devel
Link       : https://github.com/geodynamics/specfem3d/compare/8a3f14d7d473f70feb7f073639045daa35c587bc...d759e09dd946c593868753fbb4253d77378fb276

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

commit d8ee135256fd065c1bb44926bb35b197a9c8b2a9
Merge: cb1e09a e6a0ddf
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Mon Jun 23 11:51:21 2014 +0200

    Updated for coupling with DSM



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

d8ee135256fd065c1bb44926bb35b197a9c8b2a9
 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            |    5 +
 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, 1232 insertions(+), 943 deletions(-)

diff --cc src/specfem3D/initialize_simulation.f90
index c7420d2,5436676..235da4c
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@@ -60,11 -60,9 +60,16 @@@
  
  !! DK DK added this for now (March 2013) because CPML is not yet implemented for fluid-solid coupling;
  !! DK DK we will soon add it (in a month or so)
++<<<<<<< HEAD
 +  if(PML_CONDITIONS .and. ELASTIC_SIMULATION .and. ACOUSTIC_SIMULATION) &
 +    stop 'PML_CONDITIONS is still under test for this case'
++=======
+   if(PML_CONDITIONS .and. (SAVE_FORWARD .or. SIMULATION_TYPE==3)) &
+     stop 'It is still under test for adjoint simulation'
++>>>>>>> e6a0ddf9cc4f82b41302ffa3f4a4bab32503f718
  
 +  if(PML_CONDITIONS .and. (SAVE_FORWARD .or. SIMULATION_TYPE==3)) &
 +    stop 'PML_CONDITIONS is still under test for adjoint simulation'
  
    ! GPU_MODE is in par_file
    call read_gpu_mode(GPU_MODE,GRAVITY)