gkowal/amun-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into reconnection

Browse Source
This commit is contained in:
Grzegorz Kowal 2014-12-01 09:06:58 -02:00
commit 15468b805d
1 changed files with 95 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
src/boundaries.F90
View File

@ -549,121 +549,125 @@ module boundaries
if (pneigh%level > pmeta%level) then
#ifdef MPI
! check if the current block and its neighbor belong to the same process, if so,
! update fluxes directly
! check if the block and its neighbor belong to the same process
!
if (pmeta%process == nproc .and. &
pneigh%process == nproc) then
if (pmeta%process == pneigh%process) then
! check if the neighbor belongs to the current process
!
if (pneigh%process == nproc) then
#endif /* MPI */
! update directional flux from the neighbor
!
select case(n)
case(1)
select case(n)
case(1)
! prepare the boundary layer indices depending on the corner position
!
if (i == 1) then
is = ie
it = ibl
else
is = ibl
it = ie
end if
if (j == 1) then
jl = jb
ju = jb + jh - 1
else
jl = je - jh + 1
ju = je
end if
if (i == 1) then
is = ie
it = ibl
else
is = ibl
it = ie
end if
if (j == 1) then
jl = jb
ju = jb + jh - 1
else
jl = je - jh + 1
ju = je
end if
#if NDIMS == 3
if (k == 1) then
kl = kb
ku = kb + kh - 1
else
kl = ke - kh + 1
ku = ke
end if
if (k == 1) then
kl = kb
ku = kb + kh - 1
else
kl = ke - kh + 1
ku = ke
end if
#endif /* NDIMS == 3 */
! update the flux edge from the neighbor at higher level
!
call block_update_flux(i, j, k, n &
, pneigh%data%f(n,1:nv,is,jb:je,kb:ke) &
, pmeta%data%f(n,1:nv,it,jl:ju,kl:ku))
call block_update_flux(i, j, k, n &
, pneigh%data%f(n,1:nv,is,jb:je,kb:ke) &
, pmeta%data%f(n,1:nv,it,jl:ju,kl:ku))
case(2)
case(2)
! prepare the boundary layer indices depending on the corner position
!
if (i == 1) then
il = ib
iu = ib + ih - 1
else
il = ie - ih + 1
iu = ie
end if
if (j == 1) then
js = je
jt = jbl
else
js = jbl
jt = je
end if
if (i == 1) then
il = ib
iu = ib + ih - 1
else
il = ie - ih + 1
iu = ie
end if
if (j == 1) then
js = je
jt = jbl
else
js = jbl
jt = je
end if
#if NDIMS == 3
if (k == 1) then
kl = kb
ku = kb + kh - 1
else
kl = ke - kh + 1
ku = ke
end if
if (k == 1) then
kl = kb
ku = kb + kh - 1
else
kl = ke - kh + 1
ku = ke
end if
#endif /* NDIMS == 3 */
! update the flux edge from the neighbor at higher level
!
call block_update_flux(i, j, k, n &
, pneigh%data%f(n,1:nv,ib:ie,js,kb:ke) &
, pmeta%data%f(n,1:nv,il:iu,jt,kl:ku))
call block_update_flux(i, j, k, n &
, pneigh%data%f(n,1:nv,ib:ie,js,kb:ke) &
, pmeta%data%f(n,1:nv,il:iu,jt,kl:ku))
#if NDIMS == 3
case(3)
case(3)
! prepare the boundary layer indices depending on the corner position
!
if (i == 1) then
il = ib
iu = ib + ih - 1
else
il = ie - ih + 1
iu = ie
end if
if (j == 1) then
jl = jb
ju = jb + jh - 1
else
jl = je - jh + 1
ju = je
end if
if (k == 1) then
ks = ke
kt = kbl
else
ks = kbl
kt = ke
end if
if (i == 1) then
il = ib
iu = ib + ih - 1
else
il = ie - ih + 1
iu = ie
end if
if (j == 1) then
jl = jb
ju = jb + jh - 1
else
jl = je - jh + 1
ju = je
end if
if (k == 1) then
ks = ke
kt = kbl
else
ks = kbl
kt = ke
end if
! update the flux edge from the neighbor at higher level
!
call block_update_flux(i, j, k, n &
, pneigh%data%f(n,1:nv,ib:ie,jb:je,ks) &
, pmeta%data%f(n,1:nv,il:iu,jl:ju,kt))
call block_update_flux(i, j, k, n &
, pneigh%data%f(n,1:nv,ib:ie,jb:je,ks) &
, pmeta%data%f(n,1:nv,il:iu,jl:ju,kt))
#endif /* NDIMS == 3 */
end select
end select
#ifdef MPI
end if ! pneigh on the current process
! blocks belong to different processes, therefore prepare the block exchange
! object
!
@ -734,6 +738,8 @@ module boundaries
end do ! meta blocks
#ifdef MPI
!! 3. UPDATE FLUX BOUNDARIES BETWEEN BLOCKS BELONGING TO DIFFERENT PROCESSES
!!
! iterate over all process pairs
!
do p = 1, npairs
@ -1923,7 +1929,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for face boundary update
@ -2480,7 +2486,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! extract the corresponding face region from the neighbor and insert it in
@ -3065,7 +3071,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for edge boundary update
@ -3647,7 +3653,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for edge boundary update
@ -4233,7 +4239,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for edge boundary update
@ -4809,7 +4815,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for corner boundary update
@ -5273,7 +5279,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for corner boundary update
@ -5736,7 +5742,7 @@ module boundaries
! check if the neighbor belongs to the current process
!
if (pmeta%process == nproc) then
if (pneigh%process == nproc) then
#endif /* MPI */
! prepare the region indices for corner boundary update