[cig-commits] r18548 - seismo/3D/FAULT_SOURCE/branches/new_fault_db/src
percygalvez at geodynamics.org
percygalvez at geodynamics.org
Tue Jun 7 07:50:32 PDT 2011
Author: percygalvez
Date: 2011-06-07 07:50:31 -0700 (Tue, 07 Jun 2011)
New Revision: 18548
Modified:
seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/assemble_MPI_scalar.f90
seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/get_MPI.f90
Log:
new database running for splay faults without print comments using for debugging
Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/assemble_MPI_scalar.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/assemble_MPI_scalar.f90 2011-06-07 14:44:42 UTC (rev 18547)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/assemble_MPI_scalar.f90 2011-06-07 14:50:31 UTC (rev 18548)
@@ -77,14 +77,12 @@
allocate(request_recv_scalar_ext_mesh(num_interfaces_ext_mesh))
! partition border copy into the buffer
- write(6,*) 'run 1'
do iinterface = 1, num_interfaces_ext_mesh
do ipoin = 1, nibool_interfaces_ext_mesh(iinterface)
buffer_send_scalar_ext_mesh(ipoin,iinterface) = array_val(ibool_interfaces_ext_mesh(ipoin,iinterface))
enddo
enddo
- write(6,*) 'run 2'
! send messages
do iinterface = 1, num_interfaces_ext_mesh
call issend_cr(buffer_send_scalar_ext_mesh(1:nibool_interfaces_ext_mesh(iinterface),iinterface), &
@@ -101,13 +99,11 @@
)
enddo
- write(6,*) 'run 3'
! wait for communications completion
do iinterface = 1, num_interfaces_ext_mesh
call wait_req(request_recv_scalar_ext_mesh(iinterface))
enddo
- write(6,*) 'run 4'
! adding contributions of neighbours
do iinterface = 1, num_interfaces_ext_mesh
do ipoin = 1, nibool_interfaces_ext_mesh(iinterface)
@@ -116,13 +112,11 @@
enddo
enddo
- write(6,*) 'run 5'
! wait for communications completion (send)
do iinterface = 1, num_interfaces_ext_mesh
call wait_req(request_send_scalar_ext_mesh(iinterface))
enddo
- write(6,*) 'run 6'
deallocate(buffer_send_scalar_ext_mesh)
deallocate(buffer_recv_scalar_ext_mesh)
deallocate(request_send_scalar_ext_mesh)
@@ -165,16 +159,13 @@
! here we have to assemble all the contributions between partitions using MPI
! assemble only if more than one partition
- write(6,*) 'NPROC',NPROC
-
if(NPROC > 1) then
- write(6,*) 'run 1'
+
allocate(buffer_send_scalar_ext_mesh(max_nibool_interfaces_ext_mesh,num_interfaces_ext_mesh))
allocate(buffer_recv_scalar_ext_mesh(max_nibool_interfaces_ext_mesh,num_interfaces_ext_mesh))
allocate(request_send_scalar_ext_mesh(num_interfaces_ext_mesh))
allocate(request_recv_scalar_ext_mesh(num_interfaces_ext_mesh))
- write(6,*) 'run 2'
! partition border copy into the buffer
do iinterface = 1, num_interfaces_ext_mesh
do ipoin = 1, nibool_interfaces_ext_mesh(iinterface)
@@ -182,7 +173,6 @@
enddo
enddo
- write(6,*) 'run 3'
! send messages
do iinterface = 1, num_interfaces_ext_mesh
call issend_i(buffer_send_scalar_ext_mesh(1:nibool_interfaces_ext_mesh(iinterface),iinterface), &
@@ -198,13 +188,11 @@
request_recv_scalar_ext_mesh(iinterface) &
)
enddo
- write(6,*) 'run 4'
! wait for communications completion
do iinterface = 1, num_interfaces_ext_mesh
call wait_req(request_recv_scalar_ext_mesh(iinterface))
enddo
- write(6,*) 'run 5'
! adding contributions of neighbours
do iinterface = 1, num_interfaces_ext_mesh
@@ -213,13 +201,11 @@
array_val(ibool_interfaces_ext_mesh(ipoin,iinterface)) + buffer_recv_scalar_ext_mesh(ipoin,iinterface)
enddo
enddo
- write(6,*) 'run 6'
! wait for communications completion (send)
do iinterface = 1, num_interfaces_ext_mesh
call wait_req(request_send_scalar_ext_mesh(iinterface))
enddo
- write(6,*) 'run 7'
deallocate(buffer_send_scalar_ext_mesh)
deallocate(buffer_recv_scalar_ext_mesh)
Modified: seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/get_MPI.f90
===================================================================
--- seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/get_MPI.f90 2011-06-07 14:44:42 UTC (rev 18547)
+++ seismo/3D/FAULT_SOURCE/branches/new_fault_db/src/get_MPI.f90 2011-06-07 14:50:31 UTC (rev 18548)
@@ -155,7 +155,7 @@
if( myrank == 0 ) then
write(IMAIN,*) ' total MPI interface points: ',ilocnum
endif
-
+
! checks with assembly of test fields
allocate(test_flag(nglob),test_flag_cr(nglob))
test_flag(:) = 0
@@ -179,8 +179,6 @@
enddo
enddo
enddo
-
- write(6,*) 'sync 1' !test
call sync_all()
! collects contributions from different MPI partitions
@@ -194,14 +192,8 @@
count = count + nibool_interfaces_ext_mesh(iinterface)
!write(*,*) myrank,'interfaces ',iinterface,nibool_interfaces_ext_mesh(iinterface),max_nibool_interfaces_ext_mesh
enddo
-
- write(6,*) 'sync 2' !test
- write(6,*) 'proc : ',myrank
call sync_all()
-
- write(6,*) 'sync 2.1' !test
- write(6,*) 'proc : ',myrank
-
+
call sum_all_i(count,iglob)
if( myrank == 0 ) then
if( iglob /= ilocnum ) call exit_mpi(myrank,'error total global MPI interface points')
@@ -209,16 +201,11 @@
! adds contributions from different partitions to flag arrays
! integer arrays
-
- write(6,*) 'sync 3' !test
- write(6,*) 'proc',myrank
call assemble_MPI_scalar_i_ext_mesh(NPROC,nglob,test_flag, &
num_interfaces_ext_mesh,max_nibool_interfaces_ext_mesh, &
nibool_interfaces_ext_mesh,ibool_interfaces_dummy,&
my_neighbours_ext_mesh)
! custom_real arrays
-
- write(6,*) 'sync 4' !test (CODE STOPS inside this subroutine below)
call assemble_MPI_scalar_ext_mesh(NPROC,nglob,test_flag_cr, &
num_interfaces_ext_mesh,max_nibool_interfaces_ext_mesh, &
nibool_interfaces_ext_mesh,ibool_interfaces_dummy, &
@@ -231,9 +218,7 @@
! only counts flags with MPI contributions
if( test_flag(iglob) > myrank+1 ) i = i + 1
if( test_flag_cr(iglob) > myrank+1.0) j = j + 1
- enddo
-
- write(6,*) 'sync 5' !test
+ enddo
call sum_all_i(i,inum)
call sum_all_i(j,iglob)
if( myrank == 0 ) then
More information about the CIG-COMMITS
mailing list