[cig-commits] [commit] devel: DSM changes (f838c33)

[cig_noreply at geodynamics.org]

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

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

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

commit f838c332a06b1990054e418da59bad02ee0b2e48
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Wed Jul 9 13:06:46 2014 +0200

    DSM changes


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

f838c332a06b1990054e418da59bad02ee0b2e48
 src/specfem3D/compute_add_sources_viscoelastic.f90        | 12 ------------
 src/specfem3D/compute_stacey_viscoelastic.f90             |  8 +++-----
 utils/DSM_FOR_SPECFEM3D/example/ParFileMeshChunk          | 15 +++++----------
 .../example/batch_run_benchmark_all_process.sh            |  2 +-
 4 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/specfem3D/compute_add_sources_viscoelastic.f90 b/src/specfem3D/compute_add_sources_viscoelastic.f90
index 6f8b6ec..aa8c895 100644
--- a/src/specfem3D/compute_add_sources_viscoelastic.f90
+++ b/src/specfem3D/compute_add_sources_viscoelastic.f90
@@ -447,15 +447,9 @@
   real(kind=CUSTOM_REAL) stf_used,stf_used_total_all,time_source
   integer :: isource,iglob,i,j,k,ispec
 
-<<<<<<< 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
@@ -674,15 +668,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
diff --git a/src/specfem3D/compute_stacey_viscoelastic.f90 b/src/specfem3D/compute_stacey_viscoelastic.f90
index 95175ce..b285a67 100644
--- a/src/specfem3D/compute_stacey_viscoelastic.f90
+++ b/src/specfem3D/compute_stacey_viscoelastic.f90
@@ -350,11 +350,7 @@
   ! GPU_MODE variables
   integer(kind=8) :: Mesh_pointer
 
-<<<<<<< HEAD
-  !! CD modif. : begin (implemented by VM) !! For coupling with DSM
-=======
   !! CD CD : begin !! For coupling with DSM
->>>>>>> 1b0834db310bc7cfc52af83933a00e7b5c44fb15
   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)
 
@@ -368,6 +364,8 @@
     endif
   endif
 
+  !! CD CD : end
+
   ! checks if anything to do
   if( num_abs_boundary_faces == 0 ) return
 
@@ -396,7 +394,7 @@
       it_dsm = it_dsm + 1
     endif
   endif
-  !! CD CD
+  !! CD CD : end
 
   end subroutine compute_stacey_viscoelastic_GPU
 
diff --git a/utils/DSM_FOR_SPECFEM3D/example/ParFileMeshChunk b/utils/DSM_FOR_SPECFEM3D/example/ParFileMeshChunk
index 3c5c109..105ab4e 100755
--- a/utils/DSM_FOR_SPECFEM3D/example/ParFileMeshChunk
+++ b/utils/DSM_FOR_SPECFEM3D/example/ParFileMeshChunk
@@ -1,10 +1,5 @@
-#
-   6.00000000000000        3.00000000000000     
-#
-   60.0000000000000       0.000000000000000E+000  0.000000000000000E+000
-#
-   240.000000000000     
-#
-          30          15          15
-#
-iasp91_dsm
+ ../Tract/
+ ../MESH/
+ ../in_out_files/DATABASES_MPI/
+ ../in_out_files/Tractions/
+ 1
diff --git a/utils/DSM_FOR_SPECFEM3D/example/batch_run_benchmark_all_process.sh b/utils/DSM_FOR_SPECFEM3D/example/batch_run_benchmark_all_process.sh
index f641f88..23262d1 100755
--- a/utils/DSM_FOR_SPECFEM3D/example/batch_run_benchmark_all_process.sh
+++ b/utils/DSM_FOR_SPECFEM3D/example/batch_run_benchmark_all_process.sh
@@ -90,7 +90,7 @@ NPROC=24
 CPUS=24
 
 # MPIRUN COMMAND 
-MPIRUN="mpirun"
+MPIRUN="mpirun -machinefile /home/cluster_maintenance/mymachines2"
 
 # ENTER OPTION FOR MPIRUN 
 OPTION=" -np "${NPROC}