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

30
src/boundaries.F90
View File

@ -549,11 +549,13 @@ module boundaries
if (pneigh%level > pmeta%level) then if (pneigh%level > pmeta%level) then
#ifdef MPI #ifdef MPI
! check if the current block and its neighbor belong to the same process, if so, ! check if the block and its neighbor belong to the same process
! update fluxes directly
! !
if (pmeta%process == nproc .and. & if (pmeta%process == pneigh%process) then
pneigh%process == nproc) then
! check if the neighbor belongs to the current process
!
if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! update directional flux from the neighbor ! update directional flux from the neighbor
@ -664,6 +666,8 @@ module boundaries
end select end select
#ifdef MPI #ifdef MPI
end if ! pneigh on the current process
! blocks belong to different processes, therefore prepare the block exchange ! blocks belong to different processes, therefore prepare the block exchange
! object ! object
! !
@ -734,6 +738,8 @@ module boundaries
end do ! meta blocks end do ! meta blocks
#ifdef MPI #ifdef MPI
!! 3. UPDATE FLUX BOUNDARIES BETWEEN BLOCKS BELONGING TO DIFFERENT PROCESSES
!!
! iterate over all process pairs ! iterate over all process pairs
! !
do p = 1, npairs do p = 1, npairs
@ -1923,7 +1929,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for face boundary update ! prepare the region indices for face boundary update
@ -2480,7 +2486,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! extract the corresponding face region from the neighbor and insert it in ! 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 ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for edge boundary update ! prepare the region indices for edge boundary update
@ -3647,7 +3653,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for edge boundary update ! prepare the region indices for edge boundary update
@ -4233,7 +4239,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for edge boundary update ! prepare the region indices for edge boundary update
@ -4809,7 +4815,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for corner boundary update ! prepare the region indices for corner boundary update
@ -5273,7 +5279,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for corner boundary update ! prepare the region indices for corner boundary update
@ -5736,7 +5742,7 @@ module boundaries
! check if the neighbor belongs to the current process ! check if the neighbor belongs to the current process
! !
if (pmeta%process == nproc) then if (pneigh%process == nproc) then
#endif /* MPI */ #endif /* MPI */
! prepare the region indices for corner boundary update ! prepare the region indices for corner boundary update