[cig-commits] [commit] Hiro_latest: Update communication routines again (2175254)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon Nov 18 16:21:25 PST 2013
Repository : ssh://geoshell/calypso
On branch : Hiro_latest
Link : https://github.com/geodynamics/calypso/compare/93e9f8f974c7a247c8f02e54ec18de063f86c8fb...3c548304673360ddedd7d68c8095b3fb74a2b9ce
>---------------------------------------------------------------
commit 2175254d98950c91646b1b42d959636d824d10ea
Author: Hiroaki Matsui <h_kemono at mac.com>
Date: Fri Nov 1 18:06:31 2013 -0700
Update communication routines again
>---------------------------------------------------------------
2175254d98950c91646b1b42d959636d824d10ea
.../SPH_SHELL_src/r_interpolate_sph_data.f90 | 3 +-
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs.f90 | 29 +++++++++---------
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_2.f90 | 29 +++++++++---------
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_3.f90 | 29 +++++++++---------
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_6.f90 | 29 +++++++++---------
.../PARALLEL_src/SPH_SHELL_src/spherical_SRs_N.f90 | 33 ++++++++++++---------
.../SPH_SHELL_src/spherical_SRs_int.f90 | 34 +++++++++++++---------
src/programs/mesh_utilities/analyzer_test_sph.f90 | 2 +-
8 files changed, 108 insertions(+), 80 deletions(-)
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 6b4198e..9b5fb1f 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
@@ -20,8 +20,9 @@
!
use m_precision
!
- use m_constants
use calypso_mpi
+ use m_constants
+ use m_machine_parameter
use m_spheric_parameter
!
implicit none
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs.f90
index 75fdf2c..4e8caed 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs.f90
@@ -29,10 +29,13 @@
use m_spheric_parameter
use m_sph_trans_comm_table
!
- use select_spherical_SR
+ use select_calypso_SR
!
implicit none
!
+!> Data communication mode for scalar
+ integer(kind = kint) :: iflag_sph_SR = iflag_import_item
+!
! ----------------------------------------------------------------------
!
contains
@@ -133,10 +136,10 @@
real (kind=kreal), intent(inout):: X_rtm(nnod_rtm)
!
!
- call sel_sph_send_recv(nnod_rtp, nnod_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ call sel_calypso_send_recv(iflag_sph_SR, nnod_rtp, nnod_rtm, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
& irev_sr_rtm, X_rtp, X_rtm)
!
@@ -153,10 +156,10 @@
real (kind=kreal), intent(inout):: X_rtp(nnod_rtp)
!
!
- call sel_sph_send_recv(nnod_rtm, nnod_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ call sel_calypso_send_recv(iflag_sph_SR, nnod_rtm, nnod_rtp, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
& irev_sr_rtp, X_rtm, X_rtp)
!
@@ -173,10 +176,10 @@
real (kind=kreal), intent(inout):: X_rlm(nnod_rlm)
!
!
- call sel_sph_send_recv(nnod_rj, nnod_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ call sel_calypso_send_recv(iflag_sph_SR, nnod_rj, nnod_rlm, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
& irev_sr_rlm, X_rj, X_rlm)
!
@@ -193,10 +196,10 @@
real (kind=kreal), intent(inout):: X_rj(nnod_rj)
!
!
- call sel_sph_send_recv(nnod_rlm, nnod_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ call sel_calypso_send_recv(iflag_sph_SR, nnod_rlm, nnod_rj, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
& irev_sr_rj, X_rlm, X_rj)
!
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_2.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_2.f90
index d8269b6..ff99235 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_2.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_2.f90
@@ -34,10 +34,13 @@
use m_spheric_parameter
use m_sph_trans_comm_table
!
- use select_spherical_SR
+ use select_calypso_SR
!
implicit none
!
+!> Data communication mode for soleinoidal vection
+ integer(kind = kint) :: iflag_sph_SR2 = iflag_import_item
+!
! ----------------------------------------------------------------------
!
contains
@@ -136,10 +139,10 @@
real (kind=kreal), intent(inout):: X_rtm(itwo*nnod_rtm)
!
!
- call sel_sph_send_recv_2(nnod_rtp, nnod_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ call sel_calypso_send_recv_2(iflag_sph_SR2, nnod_rtp, nnod_rtm, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
& irev_sr_rtm, X_rtp, X_rtm)
!
@@ -156,10 +159,10 @@
real (kind=kreal), intent(inout):: X_rtp(itwo*nnod_rtp)
!
!
- call sel_sph_send_recv_2(nnod_rtm, nnod_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ call sel_calypso_send_recv_2(iflag_sph_SR2, nnod_rtm, nnod_rtp, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
& irev_sr_rtp, X_rtm, X_rtp)
!
@@ -176,10 +179,10 @@
real (kind=kreal), intent(inout):: X_rlm(itwo*nnod_rlm)
!
!
- call sel_sph_send_recv_2(nnod_rj, nnod_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ call sel_calypso_send_recv_2(iflag_sph_SR2, nnod_rj, nnod_rlm, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
& irev_sr_rlm, X_rj, X_rlm)
!
@@ -196,10 +199,10 @@
real (kind=kreal), intent(inout):: X_rj(itwo*nnod_rj)
!
!
- call sel_sph_send_recv_2(nnod_rlm, nnod_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ call sel_calypso_send_recv_2(iflag_sph_SR2, nnod_rlm, nnod_rj, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
& irev_sr_rj, X_rlm, X_rj)
!
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_3.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_3.f90
index 2064d5d..cd61ae0 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_3.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_3.f90
@@ -33,10 +33,13 @@
use m_spheric_parameter
use m_sph_trans_comm_table
!
- use select_spherical_SR
+ use select_calypso_SR
!
implicit none
!
+!> Data communication mode for vector
+ integer(kind = kint) :: iflag_sph_SR3 = iflag_import_item
+!
! ----------------------------------------------------------------------
!
contains
@@ -135,10 +138,10 @@
real (kind=kreal), intent(inout):: X_rtm(ithree*nnod_rtm)
!
!
- call sel_sph_send_recv_3(nnod_rtp, nnod_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ call sel_calypso_send_recv_3(iflag_sph_SR3, nnod_rtp, nnod_rtm, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
& irev_sr_rtm, X_rtp, X_rtm)
!
@@ -155,10 +158,10 @@
real (kind=kreal), intent(inout):: X_rtp(ithree*nnod_rtp)
!
!
- call sel_sph_send_recv_3(nnod_rtm, nnod_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ call sel_calypso_send_recv_3(iflag_sph_SR3, nnod_rtm, nnod_rtp, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
& irev_sr_rtp, X_rtm, X_rtp)
!
@@ -175,10 +178,10 @@
real (kind=kreal), intent(inout):: X_rlm(ithree*nnod_rlm)
!
!
- call sel_sph_send_recv_3(nnod_rj, nnod_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ call sel_calypso_send_recv_3(iflag_sph_SR3, nnod_rj, nnod_rlm, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
& irev_sr_rlm, X_rj, X_rlm)
!
@@ -195,10 +198,10 @@
real (kind=kreal), intent(inout):: X_rj(ithree*nnod_rj)
!
!
- call sel_sph_send_recv_3(nnod_rlm, nnod_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ call sel_calypso_send_recv_3(iflag_sph_SR3, nnod_rlm, nnod_rj, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
& irev_sr_rj, X_rlm, X_rj)
!
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_6.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_6.f90
index 89139ce..b16b0a4 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_6.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_6.f90
@@ -33,10 +33,13 @@
use m_spheric_parameter
use m_sph_trans_comm_table
!
- use select_spherical_SR
+ use select_calypso_SR
!
implicit none
!
+!> Data communication mode for six components data
+ integer(kind = kint) :: iflag_sph_SR6 = iflag_import_item
+!
! ----------------------------------------------------------------------
!
contains
@@ -134,10 +137,10 @@
real (kind=kreal), intent(inout):: X_rtm(isix*nnod_rtm)
!
!
- call sel_sph_send_recv_6(nnod_rtp, nnod_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ call sel_calypso_send_recv_6(iflag_sph_SR6, nnod_rtp, nnod_rtm, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
& irev_sr_rtm, X_rtp, X_rtm)
!
@@ -154,10 +157,10 @@
real (kind=kreal), intent(inout):: X_rtp(isix*nnod_rtp)
!
!
- call sel_sph_send_recv_6(nnod_rtm, nnod_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ call sel_calypso_send_recv_6(iflag_sph_SR6, nnod_rtm, nnod_rtp, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
& irev_sr_rtp, X_rtm, X_rtp)
!
@@ -174,10 +177,10 @@
real (kind=kreal), intent(inout):: X_rlm(isix*nnod_rlm)
!
!
- call sel_sph_send_recv_6(nnod_rj, nnod_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ call sel_calypso_send_recv_6(iflag_sph_SR6, nnod_rj, nnod_rlm, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
& irev_sr_rlm, X_rj, X_rlm)
!
@@ -194,10 +197,10 @@
real (kind=kreal), intent(inout):: X_rj(isix*nnod_rj)
!
!
- call sel_sph_send_recv_6(nnod_rlm, nnod_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ call sel_calypso_send_recv_6(iflag_sph_SR6, nnod_rlm, nnod_rj, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
& irev_sr_rj, X_rlm, X_rj)
!
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_N.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_N.f90
index fff4110..dbec822 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_N.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_N.f90
@@ -36,10 +36,13 @@
use m_spheric_parameter
use m_sph_trans_comm_table
!
- use select_spherical_SR
+ use select_calypso_SR
!
implicit none
!
+!> Data communication mode for arbitrary size data
+ integer(kind = kint) :: iflag_sph_SRN = iflag_import_item
+!
! ----------------------------------------------------------------------
!
contains
@@ -139,10 +142,11 @@
real (kind=kreal), intent(inout):: X_rtm(NB*nnod_rtm)
!
!
- call sel_sph_send_recv_N(NB, nnod_rtp, nnod_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ call sel_calypso_send_recv_N &
+ & (iflag_sph_SRN, NB, nnod_rtp, nnod_rtm, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
& irev_sr_rtm, X_rtp, X_rtm)
!
@@ -160,10 +164,11 @@
real (kind=kreal), intent(inout):: X_rtp(NB*nnod_rtp)
!
!
- call sel_sph_send_recv_N(NB, nnod_rtm, nnod_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ call sel_calypso_send_recv_N &
+ & (iflag_sph_SRN, NB, nnod_rtm, nnod_rtp, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
& irev_sr_rtp, X_rtm, X_rtp)
!
@@ -181,10 +186,11 @@
real (kind=kreal), intent(inout):: X_rlm(NB*nnod_rlm)
!
!
- call sel_sph_send_recv_N(NB, nnod_rj, nnod_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ call sel_calypso_send_recv_N &
+ & (iflag_sph_SRN, NB, nnod_rj, nnod_rlm, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
& irev_sr_rlm, X_rj, X_rlm)
!
@@ -202,10 +208,11 @@
real (kind=kreal), intent(inout):: X_rj(NB*nnod_rj)
!
!
- call sel_sph_send_recv_N(NB, nnod_rlm, nnod_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ call sel_calypso_send_recv_N &
+ & (iflag_sph_SRN, NB, nnod_rlm, nnod_rj, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
& irev_sr_rj, X_rlm, X_rj)
!
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_int.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_int.f90
index ef6f324..d04249c 100644
--- a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_int.f90
+++ b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/spherical_SRs_int.f90
@@ -28,10 +28,14 @@
use m_constants
use m_spheric_parameter
use m_sph_trans_comm_table
- use select_spherical_SR
+!
+ use select_calypso_SR
!
implicit none
!
+!> Data communication mode for integer
+ integer(kind = kint) :: iflag_sph_SR_int = iflag_import_item
+!
! ----------------------------------------------------------------------
!
contains
@@ -131,10 +135,11 @@
integer (kind=kint), intent(inout):: iX_rtm(nnod_rtm)
!
!
- call sel_sph_send_recv_int(nnod_rtp, nnod_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ call sel_calypso_send_recv_int &
+ & (iflag_sph_SR_int, nnod_rtp, nnod_rtm, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
& irev_sr_rtm, iX_rtp, iX_rtm)
!
@@ -151,10 +156,11 @@
integer (kind=kint), intent(inout):: iX_rtp(nnod_rtp)
!
!
- call sel_sph_send_recv_int(nnod_rtm, nnod_rtp, &
- & nneib_domain_rtm, iflag_self_rtm, ntot_item_sr_rtm, &
+ call sel_calypso_send_recv_int &
+ & (iflag_sph_SR_int, nnod_rtm, nnod_rtp, &
+ & nneib_domain_rtm, iflag_self_rtm, &
& id_domain_rtm, istack_sr_rtm, item_sr_rtm, &
- & nneib_domain_rtp, iflag_self_rtp, ntot_item_sr_rtp, &
+ & nneib_domain_rtp, iflag_self_rtp, &
& id_domain_rtp, istack_sr_rtp, item_sr_rtp, &
& irev_sr_rtp, iX_rtm, iX_rtp)
!
@@ -171,10 +177,11 @@
integer (kind=kint), intent(inout):: iX_rlm(nnod_rlm)
!
!
- call sel_sph_send_recv_int(nnod_rj, nnod_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ call sel_calypso_send_recv_int &
+ & (iflag_sph_SR_int, nnod_rj, nnod_rlm, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
& irev_sr_rlm, iX_rj, iX_rlm)
!
@@ -191,10 +198,11 @@
integer (kind=kint), intent(inout):: iX_rj(nnod_rj)
!
!
- call sel_sph_send_recv_int(nnod_rlm, nnod_rj, &
- & nneib_domain_rlm, iflag_self_rlm, ntot_item_sr_rlm, &
+ call sel_calypso_send_recv_int &
+ & (iflag_sph_SR_int, nnod_rlm, nnod_rj, &
+ & nneib_domain_rlm, iflag_self_rlm, &
& id_domain_rlm, istack_sr_rlm, item_sr_rlm, &
- & nneib_domain_rj, iflag_self_rj, ntot_item_sr_rj, &
+ & nneib_domain_rj, iflag_self_rj, &
& id_domain_rj, istack_sr_rj, item_sr_rj, &
& irev_sr_rj, iX_rlm, iX_rj)
!
diff --git a/src/programs/mesh_utilities/analyzer_test_sph.f90 b/src/programs/mesh_utilities/analyzer_test_sph.f90
index 3091d97..a8bc2ef 100644
--- a/src/programs/mesh_utilities/analyzer_test_sph.f90
+++ b/src/programs/mesh_utilities/analyzer_test_sph.f90
@@ -57,7 +57,7 @@
use cmp_trans_sph_indices
use set_parallel_file_name
use cmp_trans_sph_tests
- use select_spherical_SR
+ use select_calypso_SR
!
character(len=kchara) :: fname_tmp, file_name
integer(kind = kint) :: itype
More information about the CIG-COMMITS
mailing list