[cig-commits] [commit] devel: Updated flags for coupling with DSM (18c368a)

cig_noreply at geodynamics.org cig_noreply at geodynamics.org
Fri Aug 1 10:06:12 PDT 2014


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

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

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

commit 18c368abba476b9db86d5ded745a1cc656b3dc32
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Mon Jun 23 15:11:41 2014 +0200

    Updated flags for coupling with DSM


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

18c368abba476b9db86d5ded745a1cc656b3dc32
 src/generate_databases/get_absorbing_boundary.f90  | 36 +++++++++++-----------
 src/generate_databases/save_arrays_solver.f90      |  4 +--
 ...compute_forces_viscoelastic_calling_routine.F90 |  4 +--
 src/specfem3D/compute_stacey_viscoelastic.f90      |  8 ++---
 src/specfem3D/initialize_simulation.f90            |  8 ++---
 src/specfem3D/prepare_timerun.F90                  |  4 +--
 src/specfem3D/read_mesh_databases.F90              |  4 +--
 src/specfem3D/specfem3D_par.f90                    |  4 +--
 8 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/generate_databases/get_absorbing_boundary.f90 b/src/generate_databases/get_absorbing_boundary.f90
index fcd997a..fb83eaa 100644
--- a/src/generate_databases/get_absorbing_boundary.f90
+++ b/src/generate_databases/get_absorbing_boundary.f90
@@ -81,7 +81,7 @@
   real(kind=CUSTOM_REAL),dimension(NGNOD2D_FOUR_CORNERS) :: xcoord,ycoord,zcoord
   integer  :: ispec,ispec2D,icorner,itop,iabsval,iface,igll,i,j,igllfree,ifree
 
-  !! C. DUROCHAT modification : begin !! additonal local parameters for coupling with DSM by VM
+  !! CD modif. : begin (implemented by VM) !! additonal local parameters For coupling with DSM
 
   logical, dimension(:,:),allocatable :: iboun   ! pll
 
@@ -106,7 +106,7 @@
     write(123,*) nspec2D_xmin
    endif
 
-  !! C. DUROCHAT modification : end
+  !! CD modif. : end
 
   ! abs face counter
   iabsval = 0
@@ -133,11 +133,11 @@
                             xstore_dummy,ystore_dummy,zstore_dummy, &
                             iface)
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(COUPLE_WITH_DSM) then 
       iboun(iface,ispec) = .true.
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! ijk indices of GLL points for face id
     call get_element_face_gll_indices(iface,ijk_face,NGLLX,NGLLZ)
@@ -160,12 +160,12 @@
                                       lnormal )
         normal_face(:,i,j) = lnormal(:)
 
-        !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+        !! CD modif. : begin (implemented by VM) !! For coupling with DSM
         if(COUPLE_WITH_DSM) then 
           write(123,'(i10,3f20.10)') ispec,xstore_dummy(ibool(i,j,1,ispec)),&
                 ystore_dummy(ibool(i,j,1,ispec)),zstore_dummy(ibool(i,j,1,ispec))
         endif
-        !! C. DUROCHAT modification : end
+        !! CD modif. : end
 
       enddo
     enddo
@@ -187,11 +187,11 @@
 
   enddo ! nspec2D_xmin
 
-  !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+  !! CD modif. : begin (implemented by VM) !! For coupling with DSM
   if(COUPLE_WITH_DSM) then 
     close(123)
   endif
-  !! C. DUROCHAT modification : end
+  !! CD modif. : end
 
   ! xmax
   ijk_face(:,:,:) = 0
@@ -215,11 +215,11 @@
                               xstore_dummy,ystore_dummy,zstore_dummy, &
                               iface )
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(COUPLE_WITH_DSM) then 
       iboun(iface,ispec) = .true.
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! ijk indices of GLL points on face
     call get_element_face_gll_indices(iface,ijk_face,NGLLX,NGLLZ)
@@ -283,11 +283,11 @@
                               xstore_dummy,ystore_dummy,zstore_dummy, &
                               iface )
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(COUPLE_WITH_DSM) then 
       iboun(iface,ispec) = .true.
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! ijk indices of GLL points on face
     call get_element_face_gll_indices(iface,ijk_face,NGLLY,NGLLZ)
@@ -351,11 +351,11 @@
                               xstore_dummy,ystore_dummy,zstore_dummy, &
                               iface )
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(COUPLE_WITH_DSM) then 
       iboun(iface,ispec) = .true.
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! ijk indices of GLL points on face
     call get_element_face_gll_indices(iface,ijk_face,NGLLY,NGLLZ)
@@ -419,11 +419,11 @@
                               xstore_dummy,ystore_dummy,zstore_dummy, &
                               iface )
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(COUPLE_WITH_DSM) then 
       iboun(iface,ispec) = .true.
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! ijk indices of GLL points on face
     call get_element_face_gll_indices(iface,ijk_face,NGLLX,NGLLY)
@@ -490,11 +490,11 @@
                               xstore_dummy,ystore_dummy,zstore_dummy, &
                               iface )
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(COUPLE_WITH_DSM) then 
       iboun(iface,ispec) = .true.
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! ijk indices of GLL points on face
     call get_element_face_gll_indices(iface,ijk_face,NGLLX,NGLLY)
diff --git a/src/generate_databases/save_arrays_solver.f90 b/src/generate_databases/save_arrays_solver.f90
index c0b35f6..8cc2e5f 100644
--- a/src/generate_databases/save_arrays_solver.f90
+++ b/src/generate_databases/save_arrays_solver.f90
@@ -571,7 +571,7 @@
       deallocate(iglob_tmp,v_tmp_i)
     endif
 
-    !! C. DUROCHAT modification : begin !! for coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if (COUPLE_WITH_DSM) then
       !if (num_abs_boundary_faces > 0) then
       filename = prname(1:len_trim(prname))//'absorb_dsm'
@@ -604,7 +604,7 @@
       !!endif
 
     endif
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     ! acoustic-poroelastic domains
     if( ACOUSTIC_SIMULATION .and. POROELASTIC_SIMULATION ) then
diff --git a/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90 b/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
index 6c72d7f..ee90a80 100644
--- a/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
+++ b/src/specfem3D/compute_forces_viscoelastic_calling_routine.F90
@@ -170,7 +170,7 @@ subroutine compute_forces_viscoelastic()
                         ispec_is_inner,phase_is_inner)
     endif
 
-    !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+    !! CD modif. : begin (implemented by VM) !! For coupling with DSM
     if(.not. COUPLE_WITH_DSM) then 
       ! adds source term (single-force/moment-tensor solution)
       call compute_add_sources_viscoelastic(NSPEC_AB,NGLOB_AB,accel, &
@@ -182,7 +182,7 @@ subroutine compute_forces_viscoelastic()
                                             nadj_rec_local,adj_sourcearrays, &
                                             NTSTEP_BETWEEN_READ_ADJSRC,NOISE_TOMOGRAPHY)
     endif
-    !! C. DUROCHAT modification : end    
+    !! CD modif. : end    
 
     ! assemble all the contributions between slices using MPI
     if( phase_is_inner .eqv. .false. ) then
diff --git a/src/specfem3D/compute_stacey_viscoelastic.f90 b/src/specfem3D/compute_stacey_viscoelastic.f90
index 732d9ab..f682f4c 100644
--- a/src/specfem3D/compute_stacey_viscoelastic.f90
+++ b/src/specfem3D/compute_stacey_viscoelastic.f90
@@ -123,13 +123,13 @@
           vy=veloc(2,iglob)
           vz=veloc(3,iglob)
 
-          !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+          !! CD modif. : begin (implemented by VM) !! For coupling with DSM
           if (COUPLE_WITH_DSM) then
             vx = vx - Veloc_dsm_boundary(1,it_dsm,igll,iface)
             vy = vy - Veloc_dsm_boundary(2,it_dsm,igll,iface)
             vz = vz - Veloc_dsm_boundary(3,it_dsm,igll,iface)
           endif
-          !! C. DUROCHAT modification : end
+          !! CD modif. : end
 
           ! gets associated normal
           nx = abs_boundary_normal(1,igll,iface)
@@ -144,13 +144,13 @@
           ty = rho_vp(i,j,k,ispec)*vn*ny + rho_vs(i,j,k,ispec)*(vy-vn*ny)
           tz = rho_vp(i,j,k,ispec)*vn*nz + rho_vs(i,j,k,ispec)*(vz-vn*nz)
 
-          !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+          !! CD modif. : begin (implemented by VM) !! For coupling with DSM
           if (COUPLE_WITH_DSM) then
             tx = tx - Tract_dsm_boundary(1,it_dsm,igll,iface)
             ty = ty - Tract_dsm_boundary(2,it_dsm,igll,iface)
             tz = tz - Tract_dsm_boundary(3,it_dsm,igll,iface)
           endif
-          !! C. DUROCHAT modification : end
+          !! CD modif. : end
 
           ! gets associated, weighted jacobian
           jacobianw = abs_boundary_jacobian2Dw(igll,iface)
diff --git a/src/specfem3D/initialize_simulation.f90 b/src/specfem3D/initialize_simulation.f90
index 715c81f..11cfd24 100644
--- a/src/specfem3D/initialize_simulation.f90
+++ b/src/specfem3D/initialize_simulation.f90
@@ -74,9 +74,9 @@
   ! GPU_MODE is in par_file
   call read_gpu_mode(GPU_MODE,GRAVITY)
 
-!! CD modif : begin (implemented by VM) !! For coupling with DSM
+!! CD modif. : begin !! For coupling with DSM
   if(GPU_MODE .and. COUPLE_WITH_DSM) stop 'Coupling with DSM currently not implemented for GPUs'
-!! CD modif : end
+!! CD modif. : 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
@@ -155,9 +155,9 @@
   ! 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)
 
-  !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  !! CD modif. : begin (implemented by VM) !! For coupling with DSM
   if (COUPLE_WITH_DSM) call create_name_database(dsmname,myrank,TRAC_PATH)
-  !! C. DUROCHAT modification : end
+  !! CD modif. : end
 
   if (ADIOS_FOR_MESH) then
     call read_mesh_for_init(NSPEC_AB, NGLOB_AB)
diff --git a/src/specfem3D/prepare_timerun.F90 b/src/specfem3D/prepare_timerun.F90
index 7e85da3..fcb863c 100644
--- a/src/specfem3D/prepare_timerun.F90
+++ b/src/specfem3D/prepare_timerun.F90
@@ -276,9 +276,9 @@
   if(ELASTIC_SIMULATION) then
     ! switches to three-component mass matrix
 
-    !! C. DUROCHAT modification : begin
+    !! CD modif. : begin (implemented by VM)
     !! For coupling with DSM : maybe some changes to make here and after
-    !! C. DUROCHAT modification : end
+    !! CD modif. : end
 
     if( STACEY_ABSORBING_CONDITIONS .and. (.not. COUPLE_WITH_DSM) ) then
       ! adds boundary contributions
diff --git a/src/specfem3D/read_mesh_databases.F90 b/src/specfem3D/read_mesh_databases.F90
index f953cc8..e042ea8 100644
--- a/src/specfem3D/read_mesh_databases.F90
+++ b/src/specfem3D/read_mesh_databases.F90
@@ -396,7 +396,7 @@
            abs_boundary_normal(NDIM,NGLLSQUARE,num_abs_boundary_faces),stat=ier)
   if( ier /= 0 ) stop 'error allocating array abs_boundary_ispec etc.'
 
-  !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  !! CD modif. : begin (implemented by VM) !! For coupling with DSM
   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))
@@ -408,7 +408,7 @@
     allocate(Veloc_dsm_boundary(1,1,1,1))
     allocate(Tract_dsm_boundary(1,1,1,1))
   endif
-  !! C. DUROCHAT modification : end
+  !! CD modif. : end
 
   if(PML_CONDITIONS)then
     if (num_abs_boundary_faces > 0) then
diff --git a/src/specfem3D/specfem3D_par.f90 b/src/specfem3D/specfem3D_par.f90
index 0f4e957..ecf9fc8 100644
--- a/src/specfem3D/specfem3D_par.f90
+++ b/src/specfem3D/specfem3D_par.f90
@@ -95,9 +95,9 @@ module specfem_par
 ! time loop step
   integer :: it
 
-  !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  !! CD modif. : begin (implemented by VM) !! For coupling with DSM
   integer :: it_dsm
-  !! C. DUROCHAT modification : end
+  !! CD modif. : end
 
 ! parameters for the source
   integer, dimension(:), allocatable :: islice_selected_source,ispec_selected_source



More information about the CIG-COMMITS mailing list