BOUNDARIES: Make variable initialization OpenMP conformant.
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
parent
c56daa6991
commit
af4b83cd7c
@ -523,12 +523,12 @@ module boundaries
|
||||
#if NDIMS == 2
|
||||
integer :: m
|
||||
#endif /* NDIMS == 2 */
|
||||
integer :: i , il , iu
|
||||
integer :: j , jl , ju
|
||||
integer :: k = 1, kl = 1, ku = 1
|
||||
integer :: i, il, iu
|
||||
integer :: j, jl, ju
|
||||
integer :: k, kl, ku
|
||||
integer :: s
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -551,11 +551,22 @@ module boundaries
|
||||
if (minlev == maxlev) return
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
scount = 0
|
||||
rcount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
#endif /* MPI */
|
||||
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
kl = 1
|
||||
ku = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
! update the fluxes between blocks on the same process
|
||||
!
|
||||
! associate pleaf with the first block on the leaf list
|
||||
@ -1407,7 +1418,7 @@ module boundaries
|
||||
type(block_meta), pointer :: pmeta
|
||||
type(block_leaf), pointer :: pleaf
|
||||
|
||||
integer :: i, j, k = 1, n
|
||||
integer :: i, j, k, n
|
||||
#if NDIMS == 2
|
||||
integer :: m
|
||||
#endif /* NDIMS == 2 */
|
||||
@ -1416,11 +1427,16 @@ module boundaries
|
||||
#if NDIMS == 3
|
||||
real(kind=8), dimension(nn) :: z
|
||||
#else /* NDIMS == 3 */
|
||||
real(kind=8), dimension( 1) :: z = 0.0d+00
|
||||
real(kind=8), dimension( 1) :: z
|
||||
#endif /* NDIMS == 3 */
|
||||
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
z = 0.0d+00
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
pleaf => list_leaf
|
||||
do while(associated(pleaf))
|
||||
pmeta => pleaf%meta
|
||||
@ -1574,14 +1590,14 @@ module boundaries
|
||||
|
||||
! local variables
|
||||
!
|
||||
integer :: i , j , k = 1
|
||||
integer :: i , j , k
|
||||
integer :: il, jl, kl
|
||||
integer :: iu, ju, ku
|
||||
integer :: is, js, ks
|
||||
integer :: it, jt, kt
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: ecount = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: ecount
|
||||
integer :: l, p
|
||||
|
||||
! local arrays
|
||||
@ -1592,6 +1608,10 @@ module boundaries
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
ecount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -1918,11 +1938,11 @@ module boundaries
|
||||
|
||||
! local variables
|
||||
!
|
||||
integer :: i , j , k = 1
|
||||
integer :: i , j , k
|
||||
integer :: il, jl, kl
|
||||
integer :: iu, ju, ku
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -1934,6 +1954,11 @@ module boundaries
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
scount = 0
|
||||
rcount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -2257,13 +2282,13 @@ module boundaries
|
||||
|
||||
! local variables
|
||||
!
|
||||
integer :: i , j , k = 1
|
||||
integer :: i , j , k
|
||||
integer :: ic, jc, kc
|
||||
integer :: ih, jh, kh
|
||||
integer :: il = 1, jl = 1, kl = 1
|
||||
integer :: iu = 1, ju = 1, ku = 1
|
||||
integer :: il, jl, kl
|
||||
integer :: iu, ju, ku
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -2274,6 +2299,13 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
il = 1
|
||||
iu = 1
|
||||
jl = 1
|
||||
ju = 1
|
||||
kl = 1
|
||||
ku = 1
|
||||
|
||||
! calculate the sizes
|
||||
!
|
||||
ih = ni + ng
|
||||
@ -2281,6 +2313,11 @@ module boundaries
|
||||
kh = ni + ng
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
scount = 0
|
||||
rcount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -2672,13 +2709,13 @@ module boundaries
|
||||
!
|
||||
integer :: i, il, iu, is, it
|
||||
integer :: j, jl, ju, js, jt
|
||||
integer :: k = 1
|
||||
integer :: k
|
||||
#if NDIMS == 3
|
||||
integer :: kl, ku, ks, kt
|
||||
#endif /* NDIMS == 3 */
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: ecount = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: ecount
|
||||
integer :: l, p
|
||||
|
||||
! local arrays
|
||||
@ -2688,9 +2725,15 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
#ifdef MPI
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
ecount = 0
|
||||
|
||||
call prepare_exchange_array()
|
||||
#endif /* MPI */
|
||||
|
||||
@ -3096,12 +3139,12 @@ module boundaries
|
||||
!
|
||||
integer :: i, il, iu
|
||||
integer :: j, jl, ju
|
||||
integer :: k = 1
|
||||
integer :: k
|
||||
#if NDIMS == 3
|
||||
integer :: kl, ku
|
||||
#endif /* NDIMS == 3 */
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -3112,7 +3155,14 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -3511,14 +3561,14 @@ module boundaries
|
||||
|
||||
! local variables
|
||||
!
|
||||
integer :: i, ic, ih, il = 1, iu = 1
|
||||
integer :: j, jc, jh, jl = 1, ju = 1
|
||||
integer :: k = 1, kc = 1
|
||||
integer :: i, ic, ih, il, iu
|
||||
integer :: j, jc, jh, jl, ju
|
||||
integer :: k, kc
|
||||
#if NDIMS == 3
|
||||
integer :: kh, kl = 1, ku = 1
|
||||
integer :: kh, kl, ku
|
||||
#endif /* NDIMS == 3 */
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -3529,6 +3579,17 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
il = 1
|
||||
iu = 1
|
||||
jl = 1
|
||||
ju = 1
|
||||
k = 1
|
||||
kc = 1
|
||||
#if NDIMS == 3
|
||||
kl = 1
|
||||
ku = 1
|
||||
#endif /* NDIMS == 3 */
|
||||
|
||||
! calculate the sizes
|
||||
!
|
||||
ih = ni + ng
|
||||
@ -3538,6 +3599,11 @@ module boundaries
|
||||
#endif /* NDIMS == 3 */
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
scount = 0
|
||||
rcount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -4007,13 +4073,13 @@ module boundaries
|
||||
!
|
||||
integer :: i, il, iu, is, it
|
||||
integer :: j, jl, ju, js, jt
|
||||
integer :: k = 1
|
||||
integer :: k
|
||||
#if NDIMS == 3
|
||||
integer :: kl, ku, ks, kt
|
||||
#endif /* NDIMS == 3 */
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: ecount = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: ecount
|
||||
integer :: l, p
|
||||
|
||||
! local arrays
|
||||
@ -4023,7 +4089,15 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
ecount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -4385,12 +4459,12 @@ module boundaries
|
||||
!
|
||||
integer :: i, il, iu
|
||||
integer :: j, jl, ju
|
||||
integer :: k = 1
|
||||
integer :: k
|
||||
#if NDIMS == 3
|
||||
integer :: kl, ku
|
||||
#endif /* NDIMS == 3 */
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -4401,7 +4475,16 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
scount = 0
|
||||
rcount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
@ -4744,12 +4827,12 @@ module boundaries
|
||||
!
|
||||
integer :: i, il, iu
|
||||
integer :: j, jl, ju
|
||||
integer :: k = 1
|
||||
integer :: k
|
||||
#if NDIMS == 3
|
||||
integer :: kl, ku
|
||||
#endif /* NDIMS == 3 */
|
||||
#ifdef MPI
|
||||
integer :: sproc = 0, rproc = 0
|
||||
integer :: sproc, rproc
|
||||
integer :: scount, rcount
|
||||
integer :: l, p
|
||||
|
||||
@ -4760,7 +4843,16 @@ module boundaries
|
||||
!
|
||||
!-------------------------------------------------------------------------------
|
||||
!
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
|
||||
#ifdef MPI
|
||||
sproc = 0
|
||||
rproc = 0
|
||||
scount = 0
|
||||
rcount = 0
|
||||
|
||||
! prepare the block exchange structures
|
||||
!
|
||||
call prepare_exchange_array()
|
||||
|
||||
@ -1502,11 +1502,11 @@ module equations
|
||||
j = 1
|
||||
jl = 1
|
||||
ju = 1
|
||||
#if NDIMS == 2
|
||||
k = 1
|
||||
#if NDIMS == 3
|
||||
kl = 1
|
||||
ku = 1
|
||||
#endif /* NDIMS == 2 */
|
||||
#endif /* NDIMS == 3 */
|
||||
|
||||
! search for negative density or pressure
|
||||
!
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user