[cig-commits] [commit] devel: Coupling with DSM (55a6501)

[cig_noreply at geodynamics.org]

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

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

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

commit 55a6501ea0bb422abb9765c541467fbfd662575d
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Thu Jun 19 13:34:58 2014 +0200

    Coupling with DSM


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

55a6501ea0bb422abb9765c541467fbfd662575d
 src/specfem3D/initialize_simulation.f90 | 15 +++++++++++----
 src/specfem3D/read_mesh_databases.F90   |  5 +++--
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index d7378f9..c7420d2 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -61,14 +61,18 @@
 !! 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)
   if(PML_CONDITIONS .and. ELASTIC_SIMULATION .and. ACOUSTIC_SIMULATION) &
-    stop 'It 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'
+    stop 'PML_CONDITIONS is still under test for this case'
 
+  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)
 
+!! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  if(GPU_MODE .and. COUPLE_WITH_DSM) stop 'Coupling with DSM currently not implemented for GPUs'
+!! C. DUROCHAT modification : end
+
   ! myrank is the rank of each process, between 0 and NPROC-1.
   ! as usual in MPI, process 0 is in charge of coordinating everything
   ! and also takes care of the main output
@@ -145,7 +149,10 @@
 
   ! reads in numbers of spectral elements and points for the part of the mesh handled by this process
   call create_name_database(prname,myrank,LOCAL_PATH)
-  if (OLD_TEST_TO_FIX_ONE_DAY) call create_name_database(dsmname,myrank,TRAC_PATH)
+
+  !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  if (COUPLE_WITH_DSM) call create_name_database(dsmname,myrank,TRAC_PATH)
+  !! C. DUROCHAT modification : end
 
   if (ADIOS_FOR_MESH) then
     call read_mesh_for_init(NSPEC_AB, NGLOB_AB)
diff --git a/src/specfem3D/read_mesh_databases.F90 b/src/specfem3D/read_mesh_databases.F90
index 6f2cd96..f953cc8 100644
--- a/src/specfem3D/read_mesh_databases.F90
+++ b/src/specfem3D/read_mesh_databases.F90
@@ -396,8 +396,8 @@
            abs_boundary_normal(NDIM,NGLLSQUARE,num_abs_boundary_faces),stat=ier)
   if( ier /= 0 ) stop 'error allocating array abs_boundary_ispec etc.'
 
-  if (OLD_TEST_TO_FIX_ONE_DAY) then
-    ! for new method
+  !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  if (COUPLE_WITH_DSM) then
     allocate(Veloc_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces))
     allocate(Tract_dsm_boundary(3,Ntime_step_dsm,NGLLSQUARE,num_abs_boundary_faces))
     open(unit=IIN_veloc_dsm,file=dsmname(1:len_trim(dsmname))//'vel.bin',status='old', &
@@ -408,6 +408,7 @@
     allocate(Veloc_dsm_boundary(1,1,1,1))
     allocate(Tract_dsm_boundary(1,1,1,1))
   endif
+  !! C. DUROCHAT modification : end
 
   if(PML_CONDITIONS)then
     if (num_abs_boundary_faces > 0) then