[cig-commits] [commit] devel: Modif comment (8b0c03c)

[cig_noreply at geodynamics.org]

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

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

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

commit 8b0c03c498a84ec96050e2c7b5de17d0b32f213b
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Mon Jul 7 15:37:54 2014 +0200

    Modif comment


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

8b0c03c498a84ec96050e2c7b5de17d0b32f213b
 src/specfem3D/compute_stacey_viscoelastic.f90 | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/specfem3D/compute_stacey_viscoelastic.f90 b/src/specfem3D/compute_stacey_viscoelastic.f90
index 8416f42..95175ce 100644
--- a/src/specfem3D/compute_stacey_viscoelastic.f90
+++ b/src/specfem3D/compute_stacey_viscoelastic.f90
@@ -80,13 +80,8 @@
   real(kind=CUSTOM_REAL) vx,vy,vz,nx,ny,nz,tx,ty,tz,vn,jacobianw
   integer :: ispec,iglob,i,j,k,iface,igll
 
-<<<<<<< HEAD
   !! CD modif. : begin (implemented by VM) !! For coupling with DSM
    
-=======
-  !! CD CD : begin !! For coupling with DSM
-
->>>>>>> 1b0834db310bc7cfc52af83933a00e7b5c44fb15
   ! See also DSM parameters in setup/constants.h.in
   real(kind=CUSTOM_REAL) :: Veloc_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces)
   real(kind=CUSTOM_REAL) :: Tract_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces)
@@ -101,11 +96,7 @@
     endif
   endif
 
-<<<<<<< HEAD
   !! CD modif. : end
-=======
-  !! CD CD
->>>>>>> 1b0834db310bc7cfc52af83933a00e7b5c44fb15
 
   ! checks if anything to do
   if( num_abs_boundary_faces == 0 ) return