From 3703264f4929ff4b9dc88187cbede539f6de7685 Mon Sep 17 00:00:00 2001
From: Antoine Cyril David Hoffmann <ahoffman@spcpc606.epfl.ch>
Date: Thu, 1 Apr 2021 13:31:51 +0200
Subject: [PATCH] renaming of variables
---
src/basic_mod.F90 | 4 ++--
src/diagnose.F90 | 18 +++++++++---------
src/fourier_mod.F90 | 2 +-
src/poisson.F90 | 10 +++++-----
src/ppinit.F90 | 8 ++++----
src/processing_mod.F90 | 4 ++--
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/src/basic_mod.F90 b/src/basic_mod.F90
index ecfb4165..2f04e232 100644
--- a/src/basic_mod.F90
+++ b/src/basic_mod.F90
@@ -12,7 +12,7 @@ MODULE basic
real(dp) :: time = 0 ! Current simulation time (Init from restart file)
INTEGER :: comm0 ! Default communicator with a topology
- INTEGER :: commp, commr ! Communicators for 1-dim cartesian subgrids of comm0
+ INTEGER :: comm_p, comm_kr ! Communicators for 1-dim cartesian subgrids of comm0
INTEGER :: commr_p0 ! Communicators along kr for only rank 0 on p
INTEGER :: jobnum = 0 ! Job number
@@ -27,7 +27,7 @@ MODULE basic
INTEGER :: num_procs ! number of MPI processes
INTEGER :: num_procs_p ! Number of processes in p
INTEGER :: num_procs_kr ! Number of processes in r
- INTEGER :: rank_0, rank_p, rank_r! Ranks in comm0, commp, commr
+ INTEGER :: rank_0, rank_p, rank_r! Ranks in comm0, comm_p, comm_kr
INTEGER :: nbr_L, nbr_R ! Left and right neighbours (along p)
INTEGER :: nbr_T, nbr_B ! Top and bottom neighbours (along kr)
diff --git a/src/diagnose.F90 b/src/diagnose.F90
index 40094b6d..e8def621 100644
--- a/src/diagnose.F90
+++ b/src/diagnose.F90
@@ -338,8 +338,8 @@ SUBROUTINE diagnose_2d
root = 0
!!!!! This is a manual way to do MPI_BCAST !!!!!!!!!!!
- CALL MPI_COMM_RANK(commp,world_rank,ierr)
- CALL MPI_COMM_SIZE(commp,world_size,ierr)
+ CALL MPI_COMM_RANK(comm_p,world_rank,ierr)
+ CALL MPI_COMM_SIZE(comm_p,world_size,ierr)
IF (world_size .GT. 1) THEN
!! Broadcast phi to the other processes on the same k range (communicator along p)
@@ -353,11 +353,11 @@ SUBROUTINE diagnose_2d
! Send it to all the other processes
DO i_ = 0,num_procs_p-1
IF (i_ .NE. world_rank) &
- CALL MPI_SEND(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, i_, 0, commp, ierr)
+ CALL MPI_SEND(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, i_, 0, comm_p, ierr)
ENDDO
ELSE
! Recieve buffer from root
- CALL MPI_RECV(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, root, 0, commp, MPI_STATUS_IGNORE, ierr)
+ CALL MPI_RECV(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, root, 0, comm_p, MPI_STATUS_IGNORE, ierr)
! Write it in phi
DO ikr = ikrs,ikre
DO ikz = ikzs,ikze
@@ -370,8 +370,8 @@ SUBROUTINE diagnose_2d
CALL write_field2d(Ne00(ikrs:ikre,ikzs:ikze), 'Ne00')
!!!!! This is a manual way to do MPI_BCAST !!!!!!!!!!!
- CALL MPI_COMM_RANK(commp,world_rank,ierr)
- CALL MPI_COMM_SIZE(commp,world_size,ierr)
+ CALL MPI_COMM_RANK(comm_p,world_rank,ierr)
+ CALL MPI_COMM_SIZE(comm_p,world_size,ierr)
IF (world_size .GT. 1) THEN
!! Broadcast phi to the other processes on the same k range (communicator along p)
@@ -385,11 +385,11 @@ SUBROUTINE diagnose_2d
! Send it to all the other processes
DO i_ = 0,num_procs_p-1
IF (i_ .NE. world_rank) &
- CALL MPI_SEND(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, i_, 0, commp, ierr)
+ CALL MPI_SEND(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, i_, 0, comm_p, ierr)
ENDDO
ELSE
! Recieve buffer from root
- CALL MPI_RECV(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, root, 0, commp, MPI_STATUS_IGNORE, ierr)
+ CALL MPI_RECV(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, root, 0, comm_p, MPI_STATUS_IGNORE, ierr)
! Write it in phi
DO ikr = ikrs,ikre
DO ikz = ikzs,ikze
@@ -408,7 +408,7 @@ CONTAINS
USE futils, ONLY: attach, putarr
USE grid, ONLY: ikrs,ikre, ikzs,ikze, nkr, nkz, local_nkr
USE prec_const
- USE basic, ONLY : commr, num_procs_p, rank_p
+ USE basic, ONLY : comm_kr, num_procs_p, rank_p
IMPLICIT NONE
COMPLEX(dp), DIMENSION(ikrs:ikre, ikzs:ikze), INTENT(IN) :: field
diff --git a/src/fourier_mod.F90 b/src/fourier_mod.F90
index 4fd4ba3a..195b0493 100644
--- a/src/fourier_mod.F90
+++ b/src/fourier_mod.F90
@@ -37,7 +37,7 @@ MODULE fourier
NR_halved = NR_/2 + 1
! communicator = MPI_COMM_WORLD
- communicator = commr
+ communicator = comm_kr
!! Complex arrays F, G
! Compute the room to allocate
diff --git a/src/poisson.F90 b/src/poisson.F90
index 9e0cb1e9..c220d812 100644
--- a/src/poisson.F90
+++ b/src/poisson.F90
@@ -76,8 +76,8 @@ SUBROUTINE poisson
root_bcast = 0 ! Proc zero computes phi for every p
!!!!! This is a manual way to do MPI_BCAST !!!!!!!!!!!
- CALL MPI_COMM_RANK(commp,world_rank,ierr)
- CALL MPI_COMM_SIZE(commp,world_size,ierr)
+ CALL MPI_COMM_RANK(comm_p,world_rank,ierr)
+ CALL MPI_COMM_SIZE(comm_p,world_size,ierr)
IF (world_size .GT. 1) THEN
!! Broadcast phi to the other processes on the same k range (communicator along p)
@@ -91,11 +91,11 @@ SUBROUTINE poisson
! Send it to all the other processes
DO i_ = 0,num_procs_p-1
IF (i_ .NE. world_rank) &
- CALL MPI_SEND(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, i_, 0, commp, ierr)
+ CALL MPI_SEND(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, i_, 0, comm_p, ierr)
ENDDO
ELSE
! Recieve buffer from root
- CALL MPI_RECV(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, root_bcast, 0, commp, MPI_STATUS_IGNORE, ierr)
+ CALL MPI_RECV(buffer, local_nkr * nkz , MPI_DOUBLE_COMPLEX, root_bcast, 0, comm_p, MPI_STATUS_IGNORE, ierr)
! Write it in phi
DO ikr = ikrs,ikre
DO ikz = ikzs,ikze
@@ -104,7 +104,7 @@ SUBROUTINE poisson
ENDDO
ENDIF
ENDIF
-
+
CALL cpu_time(t1_comm)
tc_comm = tc_comm + (t1_comm - t0_comm)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/src/ppinit.F90 b/src/ppinit.F90
index 68dc30bc..350fa817 100644
--- a/src/ppinit.F90
+++ b/src/ppinit.F90
@@ -57,11 +57,11 @@ SUBROUTINE ppinit
!
! Partitions 2-dim cartesian topology of comm0 into 1-dim cartesian subgrids
!
- CALL MPI_CART_SUB (comm0, (/.TRUE.,.FALSE./), commp, ierr)
- CALL MPI_CART_SUB (comm0, (/.FALSE.,.TRUE./), commr, ierr)
+ CALL MPI_CART_SUB (comm0, (/.TRUE.,.FALSE./), comm_p, ierr)
+ CALL MPI_CART_SUB (comm0, (/.FALSE.,.TRUE./), comm_kr, ierr)
! Find id inside the sub communicators
- CALL MPI_COMM_RANK(commp, rank_p, ierr)
- CALL MPI_COMM_RANK(commr, rank_r, ierr)
+ CALL MPI_COMM_RANK(comm_p, rank_p, ierr)
+ CALL MPI_COMM_RANK(comm_kr, rank_r, ierr)
! Find neighbours
CALL MPI_CART_SHIFT(comm0, 0, 1, nbr_L, nbr_R, ierr)
CALL MPI_CART_SHIFT(comm0, 1, 1, nbr_B, nbr_T, ierr)
diff --git a/src/processing_mod.F90 b/src/processing_mod.F90
index a99c5671..53ece956 100644
--- a/src/processing_mod.F90
+++ b/src/processing_mod.F90
@@ -46,12 +46,12 @@ SUBROUTINE compute_radial_ion_transport
IF (num_procs_kr .GT. 1) THEN
!! Everyone sends its local_sum to root = 0
IF (rank_r .NE. root) THEN
- CALL MPI_SEND(buffer, 2 , MPI_DOUBLE_PRECISION, root, 1234, commr, ierr)
+ CALL MPI_SEND(buffer, 2 , MPI_DOUBLE_PRECISION, root, 1234, comm_kr, ierr)
ELSE
! Recieve from all the other processes
DO i_ = 0,num_procs_kr-1
IF (i_ .NE. rank_r) &
- CALL MPI_RECV(buffer, 2 , MPI_DOUBLE_PRECISION, i_, 1234, commr, MPI_STATUS_IGNORE, ierr)
+ CALL MPI_RECV(buffer, 2 , MPI_DOUBLE_PRECISION, i_, 1234, comm_kr, MPI_STATUS_IGNORE, ierr)
gflux_ri = gflux_ri + buffer(1)
pflux_ri = pflux_ri + buffer(2)
ENDDO
--
GitLab