[cig-commits] [commit] devel: Updated for coupling with DSM (cb1e09a)

[cig_noreply at geodynamics.org]

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

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

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

commit cb1e09a60f274bf81925a32ca3ad953dc9f70b7d
Author: Clément Durochat <c.durochat at gmail.com>
Date:   Fri Jun 20 16:32:03 2014 +0200

    Updated for coupling with DSM


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

cb1e09a60f274bf81925a32ca3ad953dc9f70b7d
 src/generate_databases/save_arrays_solver.f90 | 15 +++++++++------
 src/shared/read_parameter_file.f90            |  2 +-
 src/specfem3D/compute_stacey_viscoelastic.f90 | 10 +++++-----
 src/specfem3D/prepare_timerun.F90             |  7 ++++++-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/generate_databases/save_arrays_solver.f90 b/src/generate_databases/save_arrays_solver.f90
index 587aebe..c0b35f6 100644
--- a/src/generate_databases/save_arrays_solver.f90
+++ b/src/generate_databases/save_arrays_solver.f90
@@ -592,13 +592,16 @@
         
       !end if
 
+      !! Don't delete this comment for the moment
+      !!
       !! saves 1. MPI interface
-      if( num_interfaces_ext_mesh >= 1 ) then
-        filename = prname(1:len_trim(prname))//'MPI_1_points'
-        call write_VTK_data_points(nglob, xstore_dummy,ystore_dummy,zstore_dummy, &
-                                   ibool_interfaces_ext_mesh_dummy(1:nibool_interfaces_ext_mesh(1),1), &
-                                   nibool_interfaces_ext_mesh(1), filename)
-      endif
+      !!
+      !!if( num_interfaces_ext_mesh >= 1 ) then
+      !!  filename = prname(1:len_trim(prname))//'MPI_1_points'
+      !!  call write_VTK_data_points(nglob, xstore_dummy,ystore_dummy,zstore_dummy, &
+      !!                             ibool_interfaces_ext_mesh_dummy(1:nibool_interfaces_ext_mesh(1),1), &
+      !!                             nibool_interfaces_ext_mesh(1), filename)
+      !!endif
 
     endif
     !! C. DUROCHAT modification : end
diff --git a/src/shared/read_parameter_file.f90 b/src/shared/read_parameter_file.f90
index 758cd67..d257bd4 100644
--- a/src/shared/read_parameter_file.f90
+++ b/src/shared/read_parameter_file.f90
@@ -170,7 +170,7 @@
   if (ierr /= 0) return
 
   !! read the traction path directory
-  if (OLD_TEST_TO_FIX_ONE_DAY) then
+  if (COUPLE_WITH_DSM) then
     call read_value_string(TRAC_PATH, 'TRAC_PATH', ierr)
     if (ierr /= 0) return
   endif
diff --git a/src/specfem3D/compute_stacey_viscoelastic.f90 b/src/specfem3D/compute_stacey_viscoelastic.f90
index ed85981..732d9ab 100644
--- a/src/specfem3D/compute_stacey_viscoelastic.f90
+++ b/src/specfem3D/compute_stacey_viscoelastic.f90
@@ -79,7 +79,7 @@
   real(kind=CUSTOM_REAL) vx,vy,vz,nx,ny,nz,tx,ty,tz,vn,jacobianw
   integer :: ispec,iglob,i,j,k,iface,igll
 
-  !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
+  !! CD modif (implemented by VM) : begin !! For coupling with DSM
    
   ! 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)
@@ -95,7 +95,7 @@
     endif
   endif
 
-  !! C. DUROCHAT modification : end
+  !! CD modif : end
 
   ! checks if anything to do
   if( num_abs_boundary_faces == 0 ) return
@@ -146,9 +146,9 @@
 
           !! C. DUROCHAT modification : begin !! For coupling with DSM by VM
           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)
+            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
 
diff --git a/src/specfem3D/prepare_timerun.F90 b/src/specfem3D/prepare_timerun.F90
index 149837c..7e85da3 100644
--- a/src/specfem3D/prepare_timerun.F90
+++ b/src/specfem3D/prepare_timerun.F90
@@ -280,16 +280,21 @@
     !! For coupling with DSM : maybe some changes to make here and after
     !! C. DUROCHAT modification : end
 
-    if( STACEY_ABSORBING_CONDITIONS ) then
+    if( STACEY_ABSORBING_CONDITIONS .and. (.not. COUPLE_WITH_DSM) ) then
       ! adds boundary contributions
       rmassx(:) = rmass(:) + rmassx(:)
       rmassy(:) = rmass(:) + rmassy(:)
       rmassz(:) = rmass(:) + rmassz(:)
+    !!elseif( STACEY_ABSORBING_CONDITIONS .and.  COUPLE_WITH_DSM ) then
+    !!  rmassx(:) = rmass(:)
+    !!  rmassy(:) = rmass(:)
+    !!  rmassz(:) = rmass(:)
     else
       rmassx(:) = rmass(:)
       rmassy(:) = rmass(:)
       rmassz(:) = rmass(:)
     endif
+
     ! not needed anymore
     deallocate(rmass)