[cig-commits] [commit] Hiro_latest: Replace wrapper routine for MPI_abort (70f33d8)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:20:33 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 70f33d812cfa47c7d453ee667b37142b7ceb4813
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Fri Sep 27 08:58:52 2013 -0700
Replace wrapper routine for MPI_abort
>---------------------------------------------------------------
70f33d812cfa47c7d453ee667b37142b7ceb4813
.../MHD_src/IO/m_ctl_data_mhd_forces.f90 | 9 +++---
.../MHD_src/IO/set_control_4_force.f90 | 7 +++--
.../MHD_src/IO/set_control_4_model.f90 | 13 +++++----
.../MHD_src/IO/set_control_4_normalize.f90 | 33 +++++++++++-----------
.../MHD_src/IO/set_control_4_time_steps.f90 | 25 ++++++++--------
.../MHD_src/sph_MHD/check_dependency_for_MHD.f90 | 13 +++++----
.../MHD_src/sph_MHD/check_field_dependency.f90 | 3 +-
.../MHD_src/sph_MHD/construct_MHD_coefficient.f90 | 3 +-
.../MHD_src/sph_MHD/set_control_sph_data_MHD.f90 | 3 +-
.../PARALLEL_src/COMM_src/m_parallel_var_dof.f90 | 19 -------------
.../COMM_src/set_ctl_parallel_platform.f90 | 3 +-
.../SPH_SHELL_src/r_interpolate_sph_data.f90 | 11 ++++----
12 files changed, 67 insertions(+), 75 deletions(-)
diff --git a/src/Fortran_libraries/MHD_src/IO/m_ctl_data_mhd_forces.f90 b/src/Fortran_libraries/MHD_src/IO/m_ctl_data_mhd_forces.f90
index 8db7703..b516bd5 100644
--- a/src/Fortran_libraries/MHD_src/IO/m_ctl_data_mhd_forces.f90
+++ b/src/Fortran_libraries/MHD_src/IO/m_ctl_data_mhd_forces.f90
@@ -72,9 +72,10 @@
use m_precision
!
use m_constants
- use m_machine_parameter
use m_parallel_var_dof
+ use m_machine_parameter
use m_read_control_elements
+ use calypso_mpi
use skip_comment_f
!
implicit none
@@ -223,7 +224,7 @@
!
call find_control_array_flag(hd_gravity_vect, num_g_vect_ctl)
if(num_g_vect_ctl.gt.0 .and. i_gravity_vect.eq.0) then
- if(num_g_vect_ctl .gt. 3) call parallel_abort(10, &
+ if(num_g_vect_ctl .gt. 3) call calypso_MPI_abort(10, &
& 'gravity vector should be 3 components')
call read_control_array_vect_list(hd_gravity_vect, &
& num_g_vect_ctl, i_gravity_vect, &
@@ -253,7 +254,7 @@
call find_control_array_flag(hd_rotation_vec, &
& num_angular_vect_ctl)
if(num_angular_vect_ctl.gt.0 .and. i_rotation_vec.eq.0) then
- if(num_angular_vect_ctl .gt. 3) call parallel_abort(10, &
+ if(num_angular_vect_ctl .gt. 3) call calypso_MPI_abort(10, &
& 'rotation vector should be 3 components')
call read_control_array_vect_list(hd_rotation_vec, &
& num_angular_vect_ctl, i_rotation_vec, &
@@ -283,7 +284,7 @@
!
call find_control_array_flag(hd_magne_vect, num_magne_vect_ctl)
if(num_magne_vect_ctl.gt.0 .and. i_magne_vect.eq.0) then
- if(num_magne_vect_ctl .ne. 3) call parallel_abort(10, &
+ if(num_magne_vect_ctl .ne. 3) call calypso_MPI_abort(10, &
& 'external magnetic field should be 3 components')
call read_control_array_vect_list(hd_magne_vect, &
& num_magne_vect_ctl, i_magne_vect, &
diff --git a/src/Fortran_libraries/MHD_src/IO/set_control_4_force.f90 b/src/Fortran_libraries/MHD_src/IO/set_control_4_force.f90
index 7d02dec..7e393bb 100644
--- a/src/Fortran_libraries/MHD_src/IO/set_control_4_force.f90
+++ b/src/Fortran_libraries/MHD_src/IO/set_control_4_force.f90
@@ -25,8 +25,9 @@
!
subroutine s_set_control_4_force
!
- use m_machine_parameter
+ use calypso_mpi
use m_parallel_var_dof
+ use m_machine_parameter
use m_control_parameter
use m_ctl_data_mhd_forces
use m_physical_property
@@ -181,7 +182,7 @@
if (i_grav .eq. iflag_const_g) then
if (i_gravity_vect .eq. 0) then
e_message = 'Set gravity vector'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
!
do i = 1, i_gravity_vect
@@ -236,7 +237,7 @@
if (iflag_magneto_cv .gt. id_turn_OFF) then
if (i_magne_vect .eq. 0) then
e_message = 'Set external magnetic field'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
!
do i = 1, i_magne_vect
diff --git a/src/Fortran_libraries/MHD_src/IO/set_control_4_model.f90 b/src/Fortran_libraries/MHD_src/IO/set_control_4_model.f90
index c252f0c..6b58a98 100644
--- a/src/Fortran_libraries/MHD_src/IO/set_control_4_model.f90
+++ b/src/Fortran_libraries/MHD_src/IO/set_control_4_model.f90
@@ -32,6 +32,7 @@
!
subroutine s_set_control_4_model
!
+ use calypso_mpi
use m_parallel_var_dof
use m_t_step_parameter
use m_phys_labels
@@ -48,7 +49,7 @@
!
if (i_scheme .eq. 0) then
e_message = 'Set time integration scheme'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
if ( scheme_ctl .eq. 'explicit_Euler' ) then
iflag_scheme = id_explicit_euler
@@ -80,7 +81,7 @@
!
if (i_num_time_evo .eq. 0) then
e_message = 'Set field for time integration'
- call parallel_abort(91, e_message)
+ call calypso_MPI_abort(91, e_message)
else
num_field_to_evolve = num_t_evo_control_ctl
if (iflag_debug .ge. iflag_routine_msg) &
@@ -123,7 +124,7 @@
& .and. iflag_t_evo_4_magne .eq. id_no_evolution &
& .and. iflag_t_evo_4_vect_p .eq. id_no_evolution) then
e_message = 'Turn on field for time integration'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
end if
!
if (iflag_debug .ge. iflag_routine_msg) then
@@ -160,7 +161,7 @@
else
e_message &
& = 'Set lower temperature and its position'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
end if
else
low_temp = low_temp_ctl
@@ -174,7 +175,7 @@
else
e_message &
& = 'Set lower temperature and its position'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
end if
else
high_temp = high_temp_ctl
@@ -206,7 +207,7 @@
if ( (i_strat_sigma*i_strat_width*i_strat_outer) .eq. 0) then
e_message &
& = 'Set parameteres for stratification'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
stratified_sigma = stratified_sigma_ctl
stratified_width = stratified_width_ctl
diff --git a/src/Fortran_libraries/MHD_src/IO/set_control_4_normalize.f90 b/src/Fortran_libraries/MHD_src/IO/set_control_4_normalize.f90
index cdae0c2..fa70fe8 100644
--- a/src/Fortran_libraries/MHD_src/IO/set_control_4_normalize.f90
+++ b/src/Fortran_libraries/MHD_src/IO/set_control_4_normalize.f90
@@ -25,6 +25,7 @@
!
subroutine s_set_control_4_normalize
!
+ use calypso_mpi
use m_parallel_var_dof
use m_machine_parameter
use m_control_parameter
@@ -44,7 +45,7 @@
if (i_num_dimless .eq. 0) then
e_message = &
& 'Set dimensionless numbers'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_dimless = num_dimless_ctl
end if
@@ -74,7 +75,7 @@
if (i_n_thermal.eq.0) then
e_message = &
& 'Set coefficients for time stepping for temperature'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_termal = num_coef_4_termal_ctl
end if
@@ -82,7 +83,7 @@
if (i_n_t_diff.eq.0) then
e_message = &
& 'Set coefficients for time stepping for thermal diffusion'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_t_diffuse = num_coef_4_t_diffuse_ctl
end if
@@ -128,7 +129,7 @@
if (i_n_mom.eq.0) then
e_message = &
& 'Set coefficients for time stepping for velocity'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_velocity = num_coef_4_velocity_ctl
end if
@@ -136,7 +137,7 @@
if (i_n_press.eq.0) then
e_message = &
& 'Set coefficients for pressure gradient'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_press = num_coef_4_press_ctl
end if
@@ -144,7 +145,7 @@
if (i_n_v_diff.eq.0) then
e_message = &
& 'Set coefficients for viscosity'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_v_diffuse = num_coef_4_v_diffuse_ctl
end if
@@ -155,7 +156,7 @@
else
if (i_n_buo.eq.0) then
e_message = 'Set coefficients for buoyancy'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_buoyancy = num_coef_4_buoyancy_ctl
end if
@@ -170,7 +171,7 @@
else
if (i_n_c_buo.eq.0) then
e_message = 'Set coefficients for compiositional buoyancy'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_comp_buo = num_coef_4_comp_buo_ctl
end if
@@ -181,7 +182,7 @@
else
if (i_n_cor.eq.0) then
e_message = 'Set coefficients for Coriolis force'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_Coriolis = num_coef_4_Coriolis_ctl
end if
@@ -192,7 +193,7 @@
else
if (i_n_lor.eq.0) then
e_message = 'Set coefficients for Lorentz force'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_Lorentz = num_coef_4_Lorentz_ctl
end if
@@ -262,7 +263,7 @@
if (i_n_magne.eq.0) then
e_message = &
& 'Set coefficients for integration for magnetic field'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_magnetic = num_coef_4_magnetic_ctl
end if
@@ -271,21 +272,21 @@
& .and. iflag_t_evo_4_vect_p .gt. id_no_evolution) then
e_message = &
& 'Set coefficients for integration for magnetic potential'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_mag_p = num_coef_4_mag_p_ctl
end if
!
if (i_n_m_diff.eq.0) then
e_message = 'Set coefficients for magnetic diffusion'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_m_diffuse = num_coef_4_m_diffuse_ctl
end if
!
if (i_n_induct.eq.0) then
e_message = 'Set coefficients for induction term'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_induction = num_coef_4_induction_ctl
end if
@@ -331,7 +332,7 @@
if (i_n_dscalar .eq. 0) then
e_message = &
& 'Set coefficients for time stepping for composition scalar'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_composition = num_coef_4_composit_ctl
end if
@@ -339,7 +340,7 @@
if (i_n_dsc_diff .eq. 0) then
e_message = &
& 'Set coefficients for time stepping for scalar diffusion'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
num_coef_4_c_diffuse = num_coef_4_c_diffuse_ctl
end if
diff --git a/src/Fortran_libraries/MHD_src/IO/set_control_4_time_steps.f90 b/src/Fortran_libraries/MHD_src/IO/set_control_4_time_steps.f90
index 5e441f6..458b6b2 100644
--- a/src/Fortran_libraries/MHD_src/IO/set_control_4_time_steps.f90
+++ b/src/Fortran_libraries/MHD_src/IO/set_control_4_time_steps.f90
@@ -16,8 +16,9 @@
!
use m_precision
!
- use m_machine_parameter
+ use calypso_mpi
use m_parallel_var_dof
+ use m_machine_parameter
use m_control_parameter
use m_ctl_data_4_time_steps
use m_t_step_parameter
@@ -56,7 +57,7 @@
!
if (i_dt.eq.0) then
e_message = 'Set delta t'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
dt = dt_ctl
ddt = 1.0d0 / dt
@@ -66,28 +67,28 @@
if(iflag_flexible_step .eq. iflag_flex_step) then
if (i_min_delta_t.eq.0) then
e_message = 'Set maximum delta t'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
dt_min = min_delta_t_ctl
end if
!
if (i_max_delta_t.eq.0) then
e_message = 'Set maximum delta t'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
dt_max = max_delta_t_ctl
end if
!
if (i_max_eps_to_shrink.eq.0) then
e_message = 'Set maximum error to shrink delta t'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
max_eps_to_shrink_dt = max_eps_to_shrink_ctl
end if
!
if (i_min_eps_to_expand.eq.0) then
e_message = 'Set minimum error to expand delta t'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
min_eps_to_expand_dt = min_eps_to_expand_ctl
end if
@@ -118,7 +119,7 @@
if (i_elapsed_time.eq.0) then
e_message &
& = 'Set elapsed time to finish (second)'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
elapsed_time = elapsed_time_ctl
end if
@@ -147,7 +148,7 @@
integer(kind = kint) :: ierr
!
call s_set_fixed_time_step_params(ierr, e_message)
- if(ierr .gt. 0) call parallel_abort(ierr, e_message)
+ if(ierr .gt. 0) call calypso_MPI_abort(ierr, e_message)
!
i_step_sgs_coefs = 1
if (iflag_dynamic_SGS .ne. id_SGS_DYNAMIC_OFF) then
@@ -180,7 +181,7 @@
!
if (i_end_rst_step .eq. 0) then
e_message = 'Set time to finish'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
istep_rst_end = end_rst_step_ctl
end if
@@ -238,7 +239,7 @@
if (i_elapsed_time.eq.0) then
e_message &
& = 'Set elapsed time to finish (second)'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
elapsed_time = elapsed_time_ctl
end if
@@ -257,7 +258,7 @@
!
if (i_rst_flag.eq.0.0d0) then
e_message = 'Set initial condition'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
if( restart_flag_ctl .eq. '0' &
& .or. restart_flag_ctl .eq. 'no_data' &
@@ -320,7 +321,7 @@
if (iflag_restart .eq. i_rst_no_file) then
if (i_dt .eq. 0) then
e_message = 'Set initial time'
- call parallel_abort(90, e_message)
+ call calypso_MPI_abort(90, e_message)
else
time_init = time_init_ctl
end if
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/check_dependency_for_MHD.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/check_dependency_for_MHD.f90
index 7b63722..04a25ef 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/check_dependency_for_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/check_dependency_for_MHD.f90
@@ -28,9 +28,10 @@
!
subroutine check_dependencies(num_nod_phys, phys_nod_name)
!
+ use calypso_mpi
+ use m_parallel_var_dof
use m_control_parameter
use m_phys_labels
- use m_parallel_var_dof
!
use check_field_dependency
!
@@ -445,8 +446,8 @@
!
if (iflag_t_evo_4_vect_p .gt. id_no_evolution &
& .and. iflag_t_evo_4_magne .gt. id_no_evolution) then
- call parallel_abort(402,'You should choose vector potential OR &
- & magnetic field for time evolution')
+ call calypso_MPI_abort(402,'You should choose vector potential &
+ & OR magnetic field for time evolution')
end if
!
if (iflag_t_evo_4_velo .gt. id_no_evolution) then
@@ -616,19 +617,19 @@
if(iflag_SGS_gravity .gt. id_SGS_none) then
if(iflag_4_gravity .eq. id_turn_OFF &
& .and. iflag_4_composit_buo .eq. id_turn_OFF) then
- call parallel_abort(100, 'set one of buoyancy sources')
+ call calypso_MPI_abort(100, 'set one of buoyancy sources')
end if
if(iflag_4_gravity .gt. id_turn_OFF) then
if(iflag_SGS_inertia.eq.id_SGS_none &
& .or. iflag_SGS_heat.eq.id_SGS_none) then
- call parallel_abort(100, &
+ call calypso_MPI_abort(100, &
& 'Turn on SGS momentum flux and heat flux')
end if
end if
if(iflag_4_composit_buo .gt. id_turn_OFF) then
if(iflag_SGS_inertia.eq.id_SGS_none &
& .or. iflag_SGS_comp_flux.eq.id_SGS_none) then
- call parallel_abort(100, &
+ call calypso_MPI_abort(100, &
& 'Turn on SGS momentum flux and composition flux')
end if
end if
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/check_field_dependency.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/check_field_dependency.f90
index fda949a..110e616 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/check_field_dependency.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/check_field_dependency.f90
@@ -33,6 +33,7 @@
subroutine check_dependence_phys(num_nod_phys, num_check, &
& target_name, phys_nod_name, phys_check_name)
!
+ use calypso_mpi
use m_parallel_var_dof
!
integer(kind=kint) :: num_nod_phys, num_check
@@ -61,7 +62,7 @@
write(*,*) trim(phys_check_name(j))
end do
end if
- call parallel_abort(402,'Stop program.')
+ call calypso_MPI_abort(402,'Stop program.')
end if
!
end subroutine check_dependence_phys
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/construct_MHD_coefficient.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/construct_MHD_coefficient.f90
index 30c8ddf..4eee28a 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/construct_MHD_coefficient.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/construct_MHD_coefficient.f90
@@ -53,6 +53,7 @@
& name_dimless, num_coef, coef_name, coef_power, &
& r_low_t, r_high_t)
!
+ use calypso_mpi
use m_parallel_var_dof
!
integer (kind = kint), intent(in) :: num_dimless
@@ -90,7 +91,7 @@
end do
if (iflag .eq. 0) then
write(*,*) 'there is missing dimensionless number'
- call parallel_abort(1000, 'normalization problem')
+ call calypso_MPI_abort(1000, 'normalization problem')
end if
end if
end do
diff --git a/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90 b/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90
index f9ab741..9125844 100644
--- a/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90
+++ b/src/Fortran_libraries/MHD_src/sph_MHD/set_control_sph_data_MHD.f90
@@ -27,6 +27,7 @@
!
subroutine s_set_control_sph_data_MHD
!
+ use calypso_mpi
use m_parallel_var_dof
use m_machine_parameter
use m_node_phys_data
@@ -59,7 +60,7 @@
! set physical values
!
if(i_num_nod_phys.eq.0) then
- call parallel_abort(90, 'Set field for simulation')
+ call calypso_MPI_abort(90, 'Set field for simulation')
end if
if (iflag_debug.eq.1) write(*,*) &
& 'original number of field ', num_nod_phys_ctl
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 02a2798..6306eae 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
@@ -10,9 +10,6 @@
!
! subroutine parallel_cal_init
!
-! subroutine parallel_abort(code , message)
-! subroutine time_prog_barrier
-!
! subroutine verify_iccgN_matrix(NB, numnod)
! subroutine allocate_iccgN_matrix(NB, numnod)
! subroutine deallocate_iccgN_matrix
@@ -72,22 +69,6 @@
! ---------------------------------------------------------------------
! ---------------------------------------------------------------------
!
- subroutine parallel_abort(code, message)
-!
- integer, intent(in) :: code
- character*(*), intent(in) :: message
-!
- write(*,*) ' ///// abnormal termination ///// ', code, &
- & ' ', message
-!
- call MPI_ABORT (SOLVER_COMM, ierr)
-!
- stop
- end subroutine parallel_abort
-!
-! ---------------------------------------------------------------------
-! ---------------------------------------------------------------------
-!
subroutine verify_iccgN_matrix(NB, numnod)
!
integer(kind = kint), intent(in) :: NB, numnod
diff --git a/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90 b/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90
index 9c4c476..dd06bdd 100644
--- a/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90
+++ b/src/Fortran_libraries/PARALLEL_src/COMM_src/set_ctl_parallel_platform.f90
@@ -15,6 +15,7 @@
use m_machine_parameter
use m_parallel_var_dof
use m_ctl_data_4_platforms
+ use calypso_mpi
!
implicit none
!
@@ -32,7 +33,7 @@
if( nprocs .ne. num_subdomain_ctl) then
write(e_message,'(a)') &
& 'Number of processes should be num. of mesh'
- call parallel_abort(ione, e_message)
+ call calypso_MPI_abort(ione, e_message)
end if
end if
!
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/r_interpolate_sph_data.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/r_interpolate_sph_data.f90
index 16a6a04..21741bc 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/r_interpolate_sph_data.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/r_interpolate_sph_data.f90
@@ -253,6 +253,7 @@
!
subroutine copy_original_sph_rj_from_IO
!
+ use calypso_mpi
use m_node_id_spherical_IO
use m_comm_data_IO
use m_group_data_sph_specr_IO
@@ -260,21 +261,21 @@
!
if(sph_rank_rj(1).ne.sph_rank_IO(1) &
& .or. sph_rank_rj(2).ne.sph_rank_IO(2)) then
- call parallel_abort(1,'rj rank ID is wrong')
+ call calypso_MPI_abort(1,'rj rank ID is wrong')
end if
!
if(nidx_global_rj(2) .ne. nidx_gl_sph_IO(2)) then
- call parallel_abort(1,'number of local mode is wrong')
+ call calypso_MPI_abort(1,'number of local mode is wrong')
end if
if(l_truncation .ne. ltr_gl_IO) then
- call parallel_abort(1,'truncation is wrong')
+ call calypso_MPI_abort(1,'truncation is wrong')
end if
!
if(ist_rj(2).ne.ist_sph_IO(2)) then
- call parallel_abort(1,'start point of harminics is wrong')
+ call calypso_MPI_abort(1,'start point of harminics is wrong')
end if
if(ied_rj(2).ne.ied_sph_IO(2)) then
- call parallel_abort(1,'end point of harminics is wrong')
+ call calypso_MPI_abort(1,'end point of harminics is wrong')
end if
!
n_rj_org = nnod_sph_IO
More information about the CIG-COMMITS
mailing list