[cig-commits] [commit] Hiro_latest: set new parameter for data communication except for solvers (09b046d)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:20:54 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 09b046db52f833586ff2def5577652daa2e89255
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Sun Sep 29 12:59:09 2013 -0700
set new parameter for data communication except for solvers
>---------------------------------------------------------------
09b046db52f833586ff2def5577652daa2e89255
.../PARALLEL_src/COMM_src/calypso_mpi.f90 | 2 --
.../PARALLEL_src/COMM_src/m_work_time.f90 | 9 ++++----
.../COMM_src/nodal_vector_send_recv.f90 | 18 ++++++++--------
.../SPH_SHELL_src/sph_trans_scalar.f90 | 24 +++++++++++-----------
.../SPH_SHELL_src/sph_trans_vector.f90 | 24 ++++++++++------------
5 files changed, 37 insertions(+), 40 deletions(-)
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90
index dbf799d..9af070b 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90
@@ -45,8 +45,6 @@
!> error flag for MPI
integer(kind=kint) :: ierr_MPI
!
- real(kind=kreal) :: START_TIME, END_TIME, COMMtime
-!
! ----------------------------------------------------------------------
!
contains
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/m_work_time.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/m_work_time.f90
index 9c0fa53..be53d29 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/m_work_time.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/m_work_time.f90
@@ -38,6 +38,8 @@
real (kind=kreal), allocatable :: start_times(:)
character (len=kchara), allocatable :: elapse_labels(:)
!
+ real(kind=kreal) :: START_SRtime, END_SRtime, SendRecvtime
+!
private :: start_times!, elapsed
private :: elapsed_total, elapsed_min, elapsed_max
!
@@ -102,9 +104,8 @@
integer(kind = kint), intent(in) :: iflag_elps
!
!
- end_time = MPI_WTIME()
- elapsed(iflag_elps) = elapsed(iflag_elps) &
- & + end_time - start_times(iflag_elps)
+ elapsed(iflag_elps) = MPI_WTIME() - start_times(iflag_elps) &
+ & + elapsed(iflag_elps)
!
end subroutine end_eleps_time
!
@@ -117,7 +118,7 @@
integer(kind = kint), intent(in) :: iflag_elps
!
!
- elapsed(iflag_elps) = COMMtime
+ elapsed(iflag_elps) = SendRecvtime
!
end subroutine copy_COMM_TIME_to_eleps
!
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90
index ed0b0c7..866a912 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/nodal_vector_send_recv.f90
@@ -44,6 +44,7 @@
subroutine nod_scalar_send_recv(scl_nod)
!
use m_array_for_send_recv
+ use m_work_time
use solver_SR
!
real(kind = kreal), intent(inout) :: scl_nod(numnod)
@@ -57,12 +58,11 @@
end do
!$omp end parallel do
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call SOLVER_SEND_RECV(numnod, num_neib, id_neib, &
& istack_import, item_import, &
& istack_export, item_export, x_vec(1) )
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
!$omp parallel do
do inod=1, numnod
@@ -77,6 +77,7 @@
subroutine nod_vector_send_recv(vec_nod)
!
use m_array_for_send_recv
+ use m_work_time
use solver_SR_3
!
real(kind = kreal), intent(inout) :: vec_nod(numnod,3)
@@ -91,13 +92,12 @@
end do
!$omp end parallel do
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call SOLVER_SEND_RECV_3(numnod, num_neib, id_neib, &
& istack_import, item_import, &
& istack_export, item_export, &
& x_vec(1) )
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
!$omp parallel do
do inod=1, numnod
@@ -114,6 +114,7 @@
subroutine nod_tensor_send_recv(tsr_nod)
!
use m_array_for_send_recv
+ use m_work_time
use solver_SR_6
!
real(kind = kreal), intent(inout) :: tsr_nod(numnod,6)
@@ -131,12 +132,11 @@
end do
!$omp end parallel do
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call SOLVER_SEND_RECV_6(numnod, num_neib, id_neib, &
& istack_import, item_import, &
& istack_export, item_export, x_vec(1) )
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
!$omp parallel do
do inod=1, numnod
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_scalar.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_scalar.f90
index 7f1524e..7595452 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_scalar.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_scalar.f90
@@ -55,6 +55,8 @@
!
subroutine sph_b_trans_scalar(nb)
!
+ use m_work_time
+!
integer(kind = kint), intent(in) :: nb
!
integer(kind = kint) :: Nstacksmp(0:np_smp)
@@ -67,12 +69,11 @@
vr_rtp(1:nb*nnod_rtp) = 0.0d0
!
! call check_sp_rj(my_rank, nb)
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(18)
call send_recv_rj_2_rlm_N(nb, sp_rj(1), sp_rlm(1))
call end_eleps_time(18)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
! call check_sp_rlm(my_rank, nb)
call start_eleps_time(22)
@@ -86,12 +87,11 @@
call end_eleps_time(22)
!
! call check_vr_rtm(my_rank, nb)
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(19)
call send_recv_rtm_2_rtp_N(nb, vr_rtm(1), vr_rtp(1))
call end_eleps_time(19)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
! call check_vr_rtp(my_rank, nb)
call start_eleps_time(24)
@@ -105,6 +105,8 @@
!
subroutine sph_f_trans_scalar(nb)
!
+ use m_work_time
+!
integer(kind = kint), intent(in) :: nb
!
!
@@ -125,12 +127,11 @@
call end_eleps_time(24)
! call check_vr_rtp(my_rank, nb)
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(20)
call send_recv_rtp_2_rtm_N(nb, vr_rtp(1), vr_rtm(1))
call end_eleps_time(20)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
! call check_vr_rtm(my_rank, nb)
!
call start_eleps_time(23)
@@ -144,12 +145,11 @@
call end_eleps_time(23)
! call check_sp_rlm(my_rank, nb)
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(21)
call send_recv_rlm_2_rj_N(nb, sp_rlm(1), sp_rj(1))
call end_eleps_time(21)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
! call check_sp_rj(my_rank, nb)
!
end subroutine sph_f_trans_scalar
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_vector.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_vector.f90
index 28723fb..93769a8 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_vector.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/sph_trans_vector.f90
@@ -64,7 +64,7 @@
!
subroutine sph_b_trans_vector(nb)
!
-! use m_work_time
+ use m_work_time
!
integer(kind = kint), intent(in) :: nb
!
@@ -79,12 +79,11 @@
!
! call check_sp_rj(my_rank, nb3)
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(18)
call send_recv_rj_2_rlm_N(nb3, sp_rj, sp_rlm)
call end_eleps_time(18)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
! call check_sp_rlm(my_rank, nb3)
!
@@ -104,12 +103,11 @@
!
! call check_vr_rtm(my_rank, nb3)
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(19)
call send_recv_rtm_2_rtp_N(nb3, vr_rtm, vr_rtp)
call end_eleps_time(19)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
!
! call check_vr_rtp(my_rank, nb3 )
!
@@ -127,6 +125,8 @@
!
subroutine sph_f_trans_vector(nb)
!
+ use m_work_time
+!
integer(kind = kint), intent(in) :: nb
!
integer(kind = kint) :: Nstacksmp(0:np_smp)
@@ -146,12 +146,11 @@
call end_eleps_time(24)
! call check_vr_rtp(my_rank, nb3 )
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(20)
call send_recv_rtp_2_rtm_N(nb3, vr_rtp, vr_rtm)
call end_eleps_time(20)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
! call check_vr_rtm(my_rank, nb3)
!
call start_eleps_time(23)
@@ -168,12 +167,11 @@
call end_eleps_time(23)
! call check_sp_rlm(my_rank, nb3)
!
- START_TIME= MPI_WTIME()
+ START_SRtime= MPI_WTIME()
call start_eleps_time(21)
call send_recv_rlm_2_rj_N(nb3, sp_rlm, sp_rj)
call end_eleps_time(21)
- END_TIME= MPI_WTIME()
- COMMtime = COMMtime + END_TIME - START_TIME
+ SendRecvtime = MPI_WTIME() - START_SRtime + SendRecvtime
! call check_sp_rj(my_rank, nb3)
!
end subroutine sph_f_trans_vector
More information about the CIG-COMMITS
mailing list