[cig-commits] [commit] Hiro_latest: Change wrapper routine for MPI_FINALIZE (6c73c9a)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:20:31 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 6c73c9a3d8ef01a6fafa49c9f24fb32a2e08e825
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Fri Sep 27 08:30:05 2013 -0700
Change wrapper routine for MPI_FINALIZE
>---------------------------------------------------------------
6c73c9a3d8ef01a6fafa49c9f24fb32a2e08e825
src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90 | 12 ++++++------
.../PARALLEL_src/COMM_src/m_parallel_var_dof.f90 | 10 ----------
src/programs/SPH_MHD/main_sph_MHD.f90 | 3 ++-
.../data_utilities/INITIAL_FIELD/main_sph_initial_fld.f90 | 3 ++-
.../data_utilities/SNAPSHOT_MHD/main_sph_dynamobench.f90 | 5 +++--
.../data_utilities/SNAPSHOT_MHD/main_sph_snapshot_noviz.f90 | 3 ++-
.../data_utilities/SNAPSHOT_MHD/main_sph_zm_snap_noviz.f90 | 3 ++-
src/programs/mesh_utilities/main_test_sph.f90 | 3 ++-
8 files changed, 19 insertions(+), 23 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 897a2bd..5ff9612 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/calypso_mpi.f90
@@ -9,8 +9,8 @@
!!
!!@verbatim
!! subroutine calypso_MPI_init(ierr)
-!! subroutine calypso_MPI_finalize(ierr)
-!! subroutine calypso_MPI_abort(code, message, ierr)
+!! subroutine calypso_MPI_finalize
+!! subroutine calypso_MPI_abort(code, message)
!!
!! subroutine calypso_MPI_barrier(ierr)
!!@endverbatim
@@ -78,9 +78,9 @@
!
! ---------------------------------------------------------------------
!
- subroutine calypso_MPI_finalize(ierr)
+ subroutine calypso_MPI_finalize
!
- integer(kind=kint), intent(inout) :: ierr
+ integer(kind=kint) :: ierr
!
!
call MPI_FINALIZE(ierr)
@@ -89,11 +89,11 @@
!
! ---------------------------------------------------------------------
!
- subroutine calypso_MPI_abort(code, message, ierr)
+ subroutine calypso_MPI_abort(code, message)
!
integer, intent(in) :: code
character*(*), intent(in) :: message
- integer(kind=kint), intent(inout) :: ierr
+ integer(kind=kint) :: ierr
!
!
write(*,*) ' ///// abnormal termination ///// ', code, &
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90
index 99084ad..02a2798 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/m_parallel_var_dof.f90
@@ -9,7 +9,6 @@
!> @brief Basic parameters for MPI parallelization
!
! subroutine parallel_cal_init
-! subroutine parallel_cal_fin
!
! subroutine parallel_abort(code , message)
! subroutine time_prog_barrier
@@ -71,15 +70,6 @@
end subroutine parallel_cal_init
!
! ---------------------------------------------------------------------
-!
- subroutine parallel_cal_fin
-!
-!
- call MPI_FINALIZE(ierr)
-!
- end subroutine parallel_cal_fin
-!
-! ---------------------------------------------------------------------
! ---------------------------------------------------------------------
!
subroutine parallel_abort(code, message)
diff --git a/src/programs/SPH_MHD/main_sph_MHD.f90 b/src/programs/SPH_MHD/main_sph_MHD.f90
index 25c6891..3e07da2 100644
--- a/src/programs/SPH_MHD/main_sph_MHD.f90
+++ b/src/programs/SPH_MHD/main_sph_MHD.f90
@@ -14,6 +14,7 @@
use m_precision
!
use m_parallel_var_dof
+ use calypso_mpi
use analyzer_sph_MHD
!
implicit none
@@ -25,7 +26,7 @@
!
call evolution_sph_MHD
!
- call parallel_cal_fin
+ call calypso_MPI_finalize
!
stop
end program kemorin_sph_MHD
diff --git a/src/programs/data_utilities/INITIAL_FIELD/main_sph_initial_fld.f90 b/src/programs/data_utilities/INITIAL_FIELD/main_sph_initial_fld.f90
index 5cf26e2..af6953f 100644
--- a/src/programs/data_utilities/INITIAL_FIELD/main_sph_initial_fld.f90
+++ b/src/programs/data_utilities/INITIAL_FIELD/main_sph_initial_fld.f90
@@ -14,6 +14,7 @@
use m_precision
!
use m_parallel_var_dof
+ use calypso_mpi
use analyzer_sph_initial_fld
!
implicit none
@@ -23,7 +24,7 @@
!
call initialize_const_sph_initial
!
- call parallel_cal_fin
+ call calypso_MPI_finalize
!
stop
end program sph_meke_initial
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_dynamobench.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_dynamobench.f90
index 9e34f86..309d39b 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_dynamobench.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_dynamobench.f90
@@ -12,8 +12,9 @@
!
use m_precision
!
- use analyzer_sph_dynamobench
use m_parallel_var_dof
+ use calypso_mpi
+ use analyzer_sph_dynamobench
!
implicit none
!
@@ -24,7 +25,7 @@
!
call evolution_sph_dynamobench
!
- call parallel_cal_fin
+ call calypso_MPI_finalize
!
write(*,*) '***** program finished *****'
stop
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_snapshot_noviz.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_snapshot_noviz.f90
index 1adbfbb..8fee6f5 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_snapshot_noviz.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_snapshot_noviz.f90
@@ -14,6 +14,7 @@
use m_precision
!
use m_parallel_var_dof
+ use calypso_mpi
use analyzer_noviz_sph_snap
!
implicit none
@@ -25,7 +26,7 @@
!
call evolution_noviz_sph_snap
!
- call parallel_cal_fin
+ call calypso_MPI_finalize
!
write(*,*) '***** program finished *****'
stop
diff --git a/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_zm_snap_noviz.f90 b/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_zm_snap_noviz.f90
index 40650de..2e4daf9 100644
--- a/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_zm_snap_noviz.f90
+++ b/src/programs/data_utilities/SNAPSHOT_MHD/main_sph_zm_snap_noviz.f90
@@ -15,6 +15,7 @@
use m_precision
!
use m_parallel_var_dof
+ use calypso_mpi
use analyzer_noviz_sph_zm_snap
!
implicit none
@@ -25,7 +26,7 @@
call initialize_noviz_sph_zm_snap
call evolution_voviz_sph_zm_snap
!
- call parallel_cal_fin
+ call calypso_MPI_finalize
!
write(*,*) '***** program finished *****'
stop
diff --git a/src/programs/mesh_utilities/main_test_sph.f90 b/src/programs/mesh_utilities/main_test_sph.f90
index ee42b99..b5b5e77 100644
--- a/src/programs/mesh_utilities/main_test_sph.f90
+++ b/src/programs/mesh_utilities/main_test_sph.f90
@@ -6,6 +6,7 @@
use m_precision
!
use m_parallel_var_dof
+ use calypso_mpi
use analyzer_test_sph
implicit none
@@ -16,7 +17,7 @@
call init_analyzer
call analyze
- call parallel_cal_fin
+ call calypso_MPI_finalize
!
write(*,*) '***** program finished *****'
stop
More information about the CIG-COMMITS
mailing list