[cig-commits] [commit] devel: Modif comments (f470392)

[cig_noreply at geodynamics.org]

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

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

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

commit f470392adfc0660f8668ccc888eaf56fc703002f
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Mon Jul 7 15:41:05 2014 +0200

    Modif comments


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

f470392adfc0660f8668ccc888eaf56fc703002f
 src/specfem3D/compute_add_sources_viscoelastic.f90 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/specfem3D/compute_add_sources_viscoelastic.f90 b/src/specfem3D/compute_add_sources_viscoelastic.f90
index 5c004ac..6f8b6ec 100644
--- a/src/specfem3D/compute_add_sources_viscoelastic.f90
+++ b/src/specfem3D/compute_add_sources_viscoelastic.f90
@@ -103,15 +103,9 @@
   !equivalence (i2head,i4head,r4head)    ! share the same 240-byte-memory
   double precision :: hxir(NGLLX),hpxir(NGLLX),hetar(NGLLY),hpetar(NGLLY),hgammar(NGLLZ),hpgammar(NGLLZ)
 
-<<<<<<< HEAD
-  !! CD modif. : begin (implemented by VM) !! For coupling with DSM
-  if (COUPLE_WITH_DSM) return
-  !! CD modif. : end
-=======
 ! no source inside the mesh if we are coupling with DSM
 ! because the source is precisely the wavefield coming from the DSM traction file
   if (COUPLE_WITH_DSM) return
->>>>>>> 1b0834db310bc7cfc52af83933a00e7b5c44fb15
 
 ! plotting source time function
   if(PRINT_SOURCE_TIME_FUNCTION .and. .not. phase_is_inner ) then