[cig-commits] r8546 - seismo/2D/SPECFEM2D/trunk

walter at geodynamics.org walter at geodynamics.org
Fri Dec 7 15:55:20 PST 2007


Author: walter
Date: 2007-12-07 15:55:19 -0800 (Fri, 07 Dec 2007)
New Revision: 8546

Modified:
   seismo/2D/SPECFEM2D/trunk/TODO_list
   seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90
   seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
   seismo/2D/SPECFEM2D/trunk/specfem2D.F90
Log:
corrected remaining warnings with ifort/pgf90. uncommented output of mesh gnuplot file for structured meshes.

Modified: seismo/2D/SPECFEM2D/trunk/TODO_list
===================================================================
--- seismo/2D/SPECFEM2D/trunk/TODO_list	2007-07-03 14:51:39 UTC (rev 8545)
+++ seismo/2D/SPECFEM2D/trunk/TODO_list	2007-12-07 23:55:19 UTC (rev 8546)
@@ -10,6 +10,5 @@
 - manual for unstructured meshes.
 - getting rid of constants_unstruct.h.
 - enabling use of real or double precision.
-- addressing all warnings (particularly with ifort due to symbols that have too many characters).
 - checking output on stdout (for data that should be printed only once).
 - compute during the non-blocking persistent MPI calls.
\ No newline at end of file

Modified: seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90	2007-07-03 14:51:39 UTC (rev 8545)
+++ seismo/2D/SPECFEM2D/trunk/assemble_MPI.F90	2007-12-07 23:55:19 UTC (rev 8546)
@@ -226,13 +226,13 @@
 
 #ifdef USE_MPI
 
-subroutine create_MPI_requests_SEND_RECV_acoustic( &
+subroutine create_MPI_req_SEND_RECV_ac( &
      ninterface, ninterface_acoustic, &
      nibool_interfaces_acoustic, &
      my_neighbours, &
-     max_ibool_interfaces_size_acoustic, &
-     buffer_send_faces_vector_acoustic, &
-     buffer_recv_faces_vector_acoustic, &
+     max_ibool_interfaces_size_ac, &
+     buffer_send_faces_vector_ac, &
+     buffer_recv_faces_vector_ac, &
      tab_requests_send_recv_acoustic, &
      inum_interfaces_acoustic &
      )
@@ -245,11 +245,11 @@
 
   integer, intent(in)  :: ninterface, ninterface_acoustic
   integer, dimension(ninterface), intent(in)  :: inum_interfaces_acoustic
-  integer, intent(in)  :: max_ibool_interfaces_size_acoustic
-  double precision, dimension(max_ibool_interfaces_size_acoustic,ninterface_acoustic), intent(in)  :: &
-       buffer_send_faces_vector_acoustic
-  double precision, dimension(max_ibool_interfaces_size_acoustic,ninterface_acoustic), intent(in)  :: &
-       buffer_recv_faces_vector_acoustic
+  integer, intent(in)  :: max_ibool_interfaces_size_ac
+  double precision, dimension(max_ibool_interfaces_size_ac,ninterface_acoustic), intent(in)  :: &
+       buffer_send_faces_vector_ac
+  double precision, dimension(max_ibool_interfaces_size_ac,ninterface_acoustic), intent(in)  :: &
+       buffer_recv_faces_vector_ac
   integer, dimension(ninterface_acoustic*2), intent(inout)  :: tab_requests_send_recv_acoustic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_acoustic
   integer, dimension(ninterface), intent(in) :: my_neighbours
@@ -263,28 +263,28 @@
      
      num_interface = inum_interfaces_acoustic(inum_interface)
      
-        call MPI_Send_init ( buffer_send_faces_vector_acoustic(1,inum_interface), &
+        call MPI_Send_init ( buffer_send_faces_vector_ac(1,inum_interface), &
              nibool_interfaces_acoustic(num_interface), MPI_DOUBLE_PRECISION, &
              my_neighbours(num_interface), 12, MPI_COMM_WORLD, &
              tab_requests_send_recv_acoustic(inum_interface), ier)
-        call MPI_Recv_init ( buffer_recv_faces_vector_acoustic(1,inum_interface), &
+        call MPI_Recv_init ( buffer_recv_faces_vector_ac(1,inum_interface), &
              nibool_interfaces_acoustic(num_interface), MPI_DOUBLE_PRECISION, &
              my_neighbours(num_interface), 12, MPI_COMM_WORLD, &
              tab_requests_send_recv_acoustic(ninterface_acoustic+inum_interface), ier)
   end do
 
 
-end subroutine create_MPI_requests_SEND_RECV_acoustic
+end subroutine create_MPI_req_SEND_RECV_ac
 
 
 
-subroutine create_MPI_requests_SEND_RECV_elastic( &
+subroutine create_MPI_req_SEND_RECV_el( &
      ninterface, ninterface_elastic, &
      nibool_interfaces_elastic, &
      my_neighbours, &
-     max_ibool_interfaces_size_elastic, &
-     buffer_send_faces_vector_elastic, &
-     buffer_recv_faces_vector_elastic, &
+     max_ibool_interfaces_size_el, &
+     buffer_send_faces_vector_el, &
+     buffer_recv_faces_vector_el, &
      tab_requests_send_recv_elastic, &
      inum_interfaces_elastic &
      )
@@ -297,11 +297,11 @@
 
   integer, intent(in)  :: ninterface, ninterface_elastic
   integer, dimension(ninterface), intent(in)  :: inum_interfaces_elastic
-  integer, intent(in)  :: max_ibool_interfaces_size_elastic
-  double precision, dimension(max_ibool_interfaces_size_elastic,ninterface_elastic), intent(in)  :: &
-       buffer_send_faces_vector_elastic
-  double precision, dimension(max_ibool_interfaces_size_elastic,ninterface_elastic), intent(in)  :: &
-       buffer_recv_faces_vector_elastic
+  integer, intent(in)  :: max_ibool_interfaces_size_el
+  double precision, dimension(max_ibool_interfaces_size_el,ninterface_elastic), intent(in)  :: &
+       buffer_send_faces_vector_el
+  double precision, dimension(max_ibool_interfaces_size_el,ninterface_elastic), intent(in)  :: &
+       buffer_recv_faces_vector_el
   integer, dimension(ninterface_elastic*2), intent(inout)  :: tab_requests_send_recv_elastic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_elastic
   integer, dimension(ninterface), intent(in) :: my_neighbours
@@ -315,23 +315,23 @@
      
      num_interface = inum_interfaces_elastic(inum_interface)
      
-        call MPI_Send_init ( buffer_send_faces_vector_elastic(1,inum_interface), &
+        call MPI_Send_init ( buffer_send_faces_vector_el(1,inum_interface), &
              NDIM*nibool_interfaces_elastic(num_interface), MPI_DOUBLE_PRECISION, &
              my_neighbours(num_interface), 13, MPI_COMM_WORLD, &
              tab_requests_send_recv_elastic(inum_interface), ier)
-        call MPI_Recv_init ( buffer_recv_faces_vector_elastic(1,inum_interface), &
+        call MPI_Recv_init ( buffer_recv_faces_vector_el(1,inum_interface), &
              NDIM*nibool_interfaces_elastic(num_interface), MPI_DOUBLE_PRECISION, &
              my_neighbours(num_interface), 13, MPI_COMM_WORLD, &
              tab_requests_send_recv_elastic(ninterface_elastic+inum_interface), ier)
   end do
 
 
-end subroutine create_MPI_requests_SEND_RECV_elastic
+end subroutine create_MPI_req_SEND_RECV_el
 
 
 
 subroutine assemble_MPI_scalar(myrank,array_val1, array_val2,npoin, &
-     ninterface, max_interface_size, max_ibool_interfaces_size_acoustic, max_ibool_interfaces_size_elastic, &
+     ninterface, max_interface_size, max_ibool_interfaces_size_ac, max_ibool_interfaces_size_el, &
      ibool_interfaces_acoustic,ibool_interfaces_elastic, nibool_interfaces_acoustic,nibool_interfaces_elastic, my_neighbours)
 
   implicit none
@@ -347,14 +347,14 @@
   integer, intent(in)  :: npoin
   integer, intent(in)  :: ninterface
   integer, intent(in)  :: max_interface_size
-  integer, intent(in)  :: max_ibool_interfaces_size_acoustic, max_ibool_interfaces_size_elastic
+  integer, intent(in)  :: max_ibool_interfaces_size_ac, max_ibool_interfaces_size_el
   integer, dimension(NGLLX*max_interface_size,ninterface), intent(in)  :: &
        ibool_interfaces_acoustic,ibool_interfaces_elastic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_acoustic,nibool_interfaces_elastic
   integer, dimension(ninterface), intent(in)  :: my_neighbours
 
 
-  double precision, dimension(max_ibool_interfaces_size_acoustic+max_ibool_interfaces_size_elastic, ninterface)  :: &
+  double precision, dimension(max_ibool_interfaces_size_ac+max_ibool_interfaces_size_el, ninterface)  :: &
        buffer_send_faces_scalar, &
        buffer_recv_faces_scalar
   integer  :: msg_status(MPI_STATUS_SIZE)
@@ -418,13 +418,13 @@
 
 
 
-subroutine assemble_MPI_vector_acoustic_start(array_val1,npoin, &
+subroutine assemble_MPI_vector_ac_start(array_val1,npoin, &
      ninterface, ninterface_acoustic, &
      inum_interfaces_acoustic, &
-     max_interface_size, max_ibool_interfaces_size_acoustic,&
+     max_interface_size, max_ibool_interfaces_size_ac,&
      ibool_interfaces_acoustic, nibool_interfaces_acoustic, &
      tab_requests_send_recv_acoustic, &
-     buffer_send_faces_vector_acoustic &
+     buffer_send_faces_vector_ac &
      )
 
   implicit none
@@ -441,12 +441,12 @@
   integer, intent(in)  :: ninterface, ninterface_acoustic
   integer, dimension(ninterface), intent(in)  :: inum_interfaces_acoustic
   integer, intent(in)  :: max_interface_size
-  integer, intent(in)  :: max_ibool_interfaces_size_acoustic
+  integer, intent(in)  :: max_ibool_interfaces_size_ac
   integer, dimension(NGLLX*max_interface_size,ninterface), intent(in)  :: ibool_interfaces_acoustic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_acoustic
   integer, dimension(ninterface_acoustic*2), intent(inout)  :: tab_requests_send_recv_acoustic
-  double precision, dimension(max_ibool_interfaces_size_acoustic,ninterface_acoustic), intent(inout)  :: &
-       buffer_send_faces_vector_acoustic
+  double precision, dimension(max_ibool_interfaces_size_ac,ninterface_acoustic), intent(inout)  :: &
+       buffer_send_faces_vector_ac
 
   integer  :: ipoin, num_interface, inum_interface
   integer  :: ier
@@ -461,7 +461,7 @@
      ipoin = 0
      do i = 1, nibool_interfaces_acoustic(num_interface)
      ipoin = ipoin + 1      
-        buffer_send_faces_vector_acoustic(ipoin,inum_interface) = &
+        buffer_send_faces_vector_ac(ipoin,inum_interface) = &
              array_val1(ibool_interfaces_acoustic(i,num_interface))
      end do
      
@@ -477,17 +477,17 @@
 !call MPI_Startall ( ninterface*2, tab_requests_send_recv(1), ier )
 
 
-end subroutine assemble_MPI_vector_acoustic_start
+end subroutine assemble_MPI_vector_ac_start
 
 
 
-subroutine assemble_MPI_vector_elastic_start(array_val2,npoin, &
+subroutine assemble_MPI_vector_el_start(array_val2,npoin, &
      ninterface, ninterface_elastic, &
      inum_interfaces_elastic, &
-     max_interface_size, max_ibool_interfaces_size_elastic,&
+     max_interface_size, max_ibool_interfaces_size_el,&
      ibool_interfaces_elastic, nibool_interfaces_elastic, &
      tab_requests_send_recv_elastic, &
-     buffer_send_faces_vector_elastic &
+     buffer_send_faces_vector_el &
      )
 
   implicit none
@@ -504,12 +504,12 @@
   integer, intent(in)  :: ninterface, ninterface_elastic
   integer, dimension(ninterface), intent(in)  :: inum_interfaces_elastic
   integer, intent(in)  :: max_interface_size
-  integer, intent(in)  :: max_ibool_interfaces_size_elastic
+  integer, intent(in)  :: max_ibool_interfaces_size_el
   integer, dimension(NGLLX*max_interface_size,ninterface), intent(in)  :: ibool_interfaces_elastic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_elastic
   integer, dimension(ninterface_elastic*2), intent(inout)  :: tab_requests_send_recv_elastic
-  double precision, dimension(max_ibool_interfaces_size_elastic,ninterface_elastic), intent(inout)  :: &
-       buffer_send_faces_vector_elastic
+  double precision, dimension(max_ibool_interfaces_size_el,ninterface_elastic), intent(inout)  :: &
+       buffer_send_faces_vector_el
   
 
 
@@ -525,7 +525,7 @@
 
      ipoin = 0
      do i = 1, nibool_interfaces_elastic(num_interface)
-        buffer_send_faces_vector_elastic(ipoin+1:ipoin+2,inum_interface) = &
+        buffer_send_faces_vector_el(ipoin+1:ipoin+2,inum_interface) = &
              array_val2(:,ibool_interfaces_elastic(i,num_interface))
         ipoin = ipoin + 2
      end do
@@ -543,17 +543,17 @@
 !call MPI_Startall ( ninterface*2, tab_requests_send_recv(1), ier )
 
 
-end subroutine assemble_MPI_vector_elastic_start
+end subroutine assemble_MPI_vector_el_start
 
 
 
-subroutine assemble_MPI_vector_acoustic_wait(array_val1,npoin, &
+subroutine assemble_MPI_vector_ac_wait(array_val1,npoin, &
      ninterface, ninterface_acoustic, &
      inum_interfaces_acoustic, &
-     max_interface_size, max_ibool_interfaces_size_acoustic,&
+     max_interface_size, max_ibool_interfaces_size_ac,&
      ibool_interfaces_acoustic, nibool_interfaces_acoustic, &
      tab_requests_send_recv_acoustic, &
-     buffer_recv_faces_vector_acoustic &
+     buffer_recv_faces_vector_ac &
      )
 
   implicit none
@@ -570,12 +570,12 @@
   integer, intent(in)  :: ninterface, ninterface_acoustic
   integer, dimension(ninterface), intent(in)  :: inum_interfaces_acoustic
   integer, intent(in)  :: max_interface_size
-  integer, intent(in)  :: max_ibool_interfaces_size_acoustic
+  integer, intent(in)  :: max_ibool_interfaces_size_ac
   integer, dimension(NGLLX*max_interface_size,ninterface), intent(in)  :: ibool_interfaces_acoustic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_acoustic
   integer, dimension(ninterface_acoustic*2), intent(inout)  :: tab_requests_send_recv_acoustic
-  double precision, dimension(max_ibool_interfaces_size_acoustic,ninterface_acoustic), intent(inout)  :: &
-       buffer_recv_faces_vector_acoustic
+  double precision, dimension(max_ibool_interfaces_size_ac,ninterface_acoustic), intent(inout)  :: &
+       buffer_recv_faces_vector_ac
 
   integer  :: ipoin, num_interface, inum_interface
   integer  :: ier
@@ -597,23 +597,23 @@
      do i = 1, nibool_interfaces_acoustic(num_interface)
         ipoin = ipoin + 1
         array_val1(ibool_interfaces_acoustic(i,num_interface)) = array_val1(ibool_interfaces_acoustic(i,num_interface)) + &
-             buffer_recv_faces_vector_acoustic(ipoin,inum_interface)
+             buffer_recv_faces_vector_ac(ipoin,inum_interface)
      end do
      
   end do
 
 
-end subroutine assemble_MPI_vector_acoustic_wait
+end subroutine assemble_MPI_vector_ac_wait
 
 
 
-subroutine assemble_MPI_vector_elastic_wait(array_val2,npoin, &
+subroutine assemble_MPI_vector_el_wait(array_val2,npoin, &
      ninterface, ninterface_elastic, &
      inum_interfaces_elastic, &
-     max_interface_size, max_ibool_interfaces_size_elastic,&
+     max_interface_size, max_ibool_interfaces_size_el,&
      ibool_interfaces_elastic, nibool_interfaces_elastic, &
      tab_requests_send_recv_elastic, &
-     buffer_recv_faces_vector_elastic &
+     buffer_recv_faces_vector_el &
      )
 
   implicit none
@@ -630,12 +630,12 @@
   integer, intent(in)  :: ninterface, ninterface_elastic
   integer, dimension(ninterface), intent(in)  :: inum_interfaces_elastic
   integer, intent(in)  :: max_interface_size
-  integer, intent(in)  :: max_ibool_interfaces_size_elastic
+  integer, intent(in)  :: max_ibool_interfaces_size_el
   integer, dimension(NGLLX*max_interface_size,ninterface), intent(in)  :: ibool_interfaces_elastic
   integer, dimension(ninterface), intent(in)  :: nibool_interfaces_elastic
   integer, dimension(ninterface_elastic*2), intent(inout)  :: tab_requests_send_recv_elastic
-  double precision, dimension(max_ibool_interfaces_size_elastic,ninterface_elastic), intent(inout)  :: &
-       buffer_recv_faces_vector_elastic
+  double precision, dimension(max_ibool_interfaces_size_el,ninterface_elastic), intent(inout)  :: &
+       buffer_recv_faces_vector_el
 
   integer  :: ipoin, num_interface, inum_interface
   integer  :: ier
@@ -656,14 +656,14 @@
      ipoin = 0
      do i = 1, nibool_interfaces_elastic(num_interface)
         array_val2(:,ibool_interfaces_elastic(i,num_interface)) = array_val2(:,ibool_interfaces_elastic(i,num_interface)) + &
-             buffer_recv_faces_vector_elastic(ipoin+1:ipoin+2,inum_interface)
+             buffer_recv_faces_vector_el(ipoin+1:ipoin+2,inum_interface)
         ipoin = ipoin + 2
      end do
      
   end do
 
 
-end subroutine assemble_MPI_vector_elastic_wait
+end subroutine assemble_MPI_vector_el_wait
 
 #endif
 

Modified: seismo/2D/SPECFEM2D/trunk/meshfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/meshfem2D.F90	2007-07-03 14:51:39 UTC (rev 8545)
+++ seismo/2D/SPECFEM2D/trunk/meshfem2D.F90	2007-12-07 23:55:19 UTC (rev 8546)
@@ -75,6 +75,7 @@
   integer imaterial_number,inumelem
   integer nelemabs,nelem_acoustic_surface,npgeo,nspec
   integer ix,iz,irec,i,j
+  integer icol, ili, istepx, istepz
   integer ixdebregion,ixfinregion,izdebregion,izfinregion
   integer iregion,imaterial,nbregion,nb_materials
   integer NTSTEP_BETWEEN_OUTPUT_INFO,pointsdisp,subsamp,seismotype,imagetype
@@ -818,64 +819,66 @@
 ! *** create a Gnuplot file that displays the grid
 ! ***
 
-!!$  print *
-!!$  print *,'Saving the grid in Gnuplot format...'
-!!$
-!!$  open(unit=20,file='OUTPUT_FILES/gridfile.gnu',status='unknown')
-!!$
-!!$! draw horizontal lines of the grid
-!!$  print *,'drawing horizontal lines of the grid'
-!!$  istepx = 1
-!!$  if(ngnod == 4) then
-!!$    istepz = 1
-!!$  else
-!!$    istepz = 2
-!!$  endif
-!!$  do ili=0,nz,istepz
-!!$    do icol=0,nx-istepx,istepx
-!!$      write(20,*) sngl(x(icol,ili)),sngl(z(icol,ili))
-!!$      write(20,*) sngl(x(icol+istepx,ili)),sngl(z(icol+istepx,ili))
-!!$      write(20,10)
-!!$    enddo
-!!$  enddo
-!!$
-!!$! draw vertical lines of the grid
-!!$  print *,'drawing vertical lines of the grid'
-!!$  if(ngnod == 4) then
-!!$    istepx = 1
-!!$  else
-!!$    istepx = 2
-!!$  endif
-!!$  istepz = 1
-!!$  do icol=0,nx,istepx
-!!$    do ili=0,nz-istepz,istepz
-!!$      write(20,*) sngl(x(icol,ili)),sngl(z(icol,ili))
-!!$      write(20,*) sngl(x(icol,ili+istepz)),sngl(z(icol,ili+istepz))
-!!$      write(20,10)
-!!$    enddo
-!!$  enddo
-!!$
-!!$ 10 format('')
-!!$
-!!$  close(20)
-!!$
-!!$! create a Gnuplot script to display the grid
-!!$  open(unit=20,file='OUTPUT_FILES/plotgnu',status='unknown')
-!!$  write(20,*) '#set term X11'
-!!$  write(20,*) 'set term postscript landscape monochrome solid "Helvetica" 22'
-!!$  write(20,*) 'set output "grid.ps"'
-!!$  write(20,*) '#set xrange [',sngl(minval(x)),':',sngl(maxval(x)),']'
-!!$  write(20,*) '#set yrange [',sngl(minval(z)),':',sngl(maxval(z)),']'
-!!$! use same unit length on both X and Y axes
-!!$  write(20,*) 'set size ratio -1'
-!!$  write(20,*) 'plot "gridfile.gnu" title "Macrobloc mesh" w l'
-!!$  write(20,*) 'pause -1 "Hit any key..."'
-!!$  close(20)
-!!$
-!!$  print *,'Grid saved in Gnuplot format...'
-!!$  print *
-  
-   
+  if ( .not. read_external_mesh ) then
+  print *
+  print *,'Saving the grid in Gnuplot format...'
+
+  open(unit=20,file='OUTPUT_FILES/gridfile.gnu',status='unknown')
+
+! draw horizontal lines of the grid
+  print *,'drawing horizontal lines of the grid'
+  istepx = 1
+  if(ngnod == 4) then
+    istepz = 1
+  else
+    istepz = 2
+  endif
+  do ili=0,nz,istepz
+    do icol=0,nx-istepx,istepx
+      write(20,*) sngl(x(icol,ili)),sngl(z(icol,ili))
+      write(20,*) sngl(x(icol+istepx,ili)),sngl(z(icol+istepx,ili))
+      write(20,10)
+    enddo
+  enddo
+
+! draw vertical lines of the grid
+  print *,'drawing vertical lines of the grid'
+  if(ngnod == 4) then
+    istepx = 1
+  else
+    istepx = 2
+  endif
+  istepz = 1
+  do icol=0,nx,istepx
+    do ili=0,nz-istepz,istepz
+      write(20,*) sngl(x(icol,ili)),sngl(z(icol,ili))
+      write(20,*) sngl(x(icol,ili+istepz)),sngl(z(icol,ili+istepz))
+      write(20,10)
+    enddo
+  enddo
+
+ 10 format('')
+
+  close(20)
+
+! create a Gnuplot script to display the grid
+  open(unit=20,file='OUTPUT_FILES/plotgnu',status='unknown')
+  write(20,*) '#set term X11'
+  write(20,*) 'set term postscript landscape monochrome solid "Helvetica" 22'
+  write(20,*) 'set output "grid.ps"'
+  write(20,*) '#set xrange [',sngl(minval(x)),':',sngl(maxval(x)),']'
+  write(20,*) '#set yrange [',sngl(minval(z)),':',sngl(maxval(z)),']'
+! use same unit length on both X and Y axes
+  write(20,*) 'set size ratio -1'
+  write(20,*) 'plot "gridfile.gnu" title "Macrobloc mesh" w l'
+  write(20,*) 'pause -1 "Hit any key..."'
+  close(20)
+
+  print *,'Grid saved in Gnuplot format...'
+  print *
+  end if
+     
+
   !*****************************
   ! Partitionning
   !*****************************

Modified: seismo/2D/SPECFEM2D/trunk/specfem2D.F90
===================================================================
--- seismo/2D/SPECFEM2D/trunk/specfem2D.F90	2007-07-03 14:51:39 UTC (rev 8545)
+++ seismo/2D/SPECFEM2D/trunk/specfem2D.F90	2007-12-07 23:55:19 UTC (rev 8546)
@@ -1001,7 +1001,7 @@
   allocate(buffer_recv_faces_vector_el(max_ibool_interfaces_size_el,ninterface_elastic))
 
 ! creating mpi non-blocking persistent communications for acoustic elements
-  call create_MPI_requests_SEND_RECV_acoustic( &
+  call create_MPI_req_SEND_RECV_ac( &
      ninterface, ninterface_acoustic, &
      nibool_interfaces_acoustic, &
      my_neighbours, &
@@ -1013,7 +1013,7 @@
      )
 
 ! creating mpi non-blocking persistent communications for elastic elements
-  call create_MPI_requests_SEND_RECV_elastic( &
+  call create_MPI_req_SEND_RECV_el( &
      ninterface, ninterface_elastic, &
      nibool_interfaces_elastic, &
      my_neighbours, &
@@ -1670,7 +1670,7 @@
 ! assembling potential_dot_dot for acoustic elements
 #ifdef USE_MPI
    if ( nproc > 1 .and. any_acoustic .and. ninterface_acoustic > 0) then
-      call assemble_MPI_vector_acoustic_start(potential_dot_dot_acoustic,npoin, &
+      call assemble_MPI_vector_ac_start(potential_dot_dot_acoustic,npoin, &
            ninterface, ninterface_acoustic, &
            inum_interfaces_acoustic, &
            max_interface_size, max_ibool_interfaces_size_ac,&
@@ -1678,7 +1678,7 @@
            tab_requests_send_recv_acoustic, &
            buffer_send_faces_vector_ac &
            )
-      call assemble_MPI_vector_acoustic_wait(potential_dot_dot_acoustic,npoin, &
+      call assemble_MPI_vector_ac_wait(potential_dot_dot_acoustic,npoin, &
            ninterface, ninterface_acoustic, &
            inum_interfaces_acoustic, &
            max_interface_size, max_ibool_interfaces_size_ac,&
@@ -1794,7 +1794,7 @@
 ! assembling accel_elastic for elastic elements
 #ifdef USE_MPI
  if ( nproc > 1 .and. any_elastic .and. ninterface_elastic > 0) then
-    call assemble_MPI_vector_elastic_start(accel_elastic,npoin, &
+    call assemble_MPI_vector_el_start(accel_elastic,npoin, &
      ninterface, ninterface_elastic, &
      inum_interfaces_elastic, &
      max_interface_size, max_ibool_interfaces_size_el,&
@@ -1802,7 +1802,7 @@
      tab_requests_send_recv_elastic, &
      buffer_send_faces_vector_el &
      )
-    call assemble_MPI_vector_elastic_wait(accel_elastic,npoin, &
+    call assemble_MPI_vector_el_wait(accel_elastic,npoin, &
      ninterface, ninterface_elastic, &
      inum_interfaces_elastic, &
      max_interface_size, max_ibool_interfaces_size_el,&



More information about the cig-commits mailing list