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

First step of the BOUNDARY module rewrite.

Browse Source
This commit is contained in:
Grzegorz Kowal 2012-08-02 16:05:02 -03:00
parent 179ae41321
commit c49dabf737
2 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/boundaries.F90
View File

@ -53,16 +53,20 @@ module boundaries
! !
! Subroutine initializes the module BOUNDARIES by setting its parameters. ! Subroutine initializes the module BOUNDARIES by setting its parameters.
! !
!
!=============================================================================== !===============================================================================
! !
subroutine initialize_boundaries() subroutine initialize_boundaries()
! include external procedures and variables ! include external procedures
!
use parameters , only : get_parameter_string
! include external variables
! !
#ifdef MPI #ifdef MPI
use mpitools , only : pdims, pcoords, periodic use mpitools , only : pdims, pcoords, periodic
#endif /* MPI */ #endif /* MPI */
use parameters, only : get_parameter_string
! local variables are not implicit by default ! local variables are not implicit by default
! !
@ -131,27 +135,39 @@ module boundaries
! !
!=============================================================================== !===============================================================================
! !
! boundary_variables: subroutine sweeps over all leaf blocks and performs ! subroutine BOUNDARY_VARIABLES:
! their conserved variables boundary update ! -----------------------------
!
! Subroutine over all leaf blocks and updates the boundaries of conserved
! variables.
!
! !
!=============================================================================== !===============================================================================
! !
subroutine boundary_variables() subroutine boundary_variables()
use blocks , only : ndims, nsides, nfaces ! include external procedures
use blocks , only : block_meta, block_data, block_info, pointer_info & !
, list_meta
use coordinates, only : ng, nd, nh, toplev
use coordinates, only : im, jm, km
use coordinates, only : ib, ibu, iel, ie, jb, jbu, jel, je, kb, kbu, kel, ke
use mpitools , only : periodic
#ifdef MPI #ifdef MPI
use mpitools , only : send_real_array, receive_real_array use mpitools , only : send_real_array, receive_real_array
use mpitools , only : nproc, nprocs
use variables, only : nqt
#endif /* MPI */ #endif /* MPI */
! declare variables ! include external variables
!
use blocks , only : ndims, nsides, nfaces
use blocks , only : block_meta, block_data, list_meta, list_data
use blocks , only : block_info, pointer_info
use coordinates , only : toplev
use coordinates , only : ng, nd, nh, im, jm, km
use coordinates , only : ib, jb, kb, ie, je, ke
use coordinates , only : ibu, jbu, kbu, iel, jel, kel
use mpitools , only : periodic
#ifdef MPI
use mpitools , only : nproc, nprocs, npmax
#endif /* MPI */
use variables , only : nt
! local variables are not implicit by default
! !
implicit none implicit none
@ -165,7 +181,7 @@ module boundaries
! local arrays ! local arrays
! !
integer , dimension(0:nprocs-1,0:nprocs-1) :: block_counter integer , dimension(0:npmax,0:npmax) :: block_counter
real(kind=8), dimension(:,:,:,:,:), allocatable :: rbuf real(kind=8), dimension(:,:,:,:,:), allocatable :: rbuf
#endif /* MPI */ #endif /* MPI */
@ -175,7 +191,7 @@ module boundaries
type(block_data), pointer :: pdata type(block_data), pointer :: pdata
#ifdef MPI #ifdef MPI
type(block_info), pointer :: pinfo type(block_info), pointer :: pinfo
type(pointer_info), dimension(0:nprocs-1,0:nprocs-1) :: block_array type(pointer_info), dimension(0:npmax,0:npmax) :: block_array
#endif /* MPI */ #endif /* MPI */
! !
!------------------------------------------------------------------------------- !-------------------------------------------------------------------------------
@ -184,13 +200,13 @@ module boundaries
! !
do level = toplev, 1, -1 do level = toplev, 1, -1
!!
!! first COPY blocks between the same levels
!!
! iterate over all directions ! iterate over all directions
! !
do idir = 1, NDIMS do idir = 1, NDIMS
!!
!! update specific boundary conditions (those without neighbours)
!!
! first update boundaries which don't have neighbors and which are not periodic ! first update boundaries which don't have neighbors and which are not periodic
! !
if (.not. periodic(idir)) then if (.not. periodic(idir)) then
@ -255,6 +271,9 @@ module boundaries
end do end do
#endif /* MPI */ #endif /* MPI */
!!
!! update boundaries between blocks at the same level
!!
! assign the pointer with the first block on in the list ! assign the pointer with the first block on in the list
! !
pmeta => list_meta pmeta => list_meta

7
src/mpitools.F90
View File

@ -46,7 +46,7 @@ module mpitools
! MPI global variables ! MPI global variables
! !
integer(kind=4), save :: comm3d integer(kind=4), save :: comm3d
integer(kind=4), save :: nproc, nprocs integer(kind=4), save :: nproc, nprocs, npmax
integer(kind=4), save, dimension(3) :: pdims, pcoords, pparity integer(kind=4), save, dimension(3) :: pdims, pcoords, pparity
integer(kind=4), save, dimension(3,2) :: pneighs integer(kind=4), save, dimension(3,2) :: pneighs
logical , save, dimension(3) :: periodic logical , save, dimension(3) :: periodic
@ -109,6 +109,7 @@ module mpitools
! !
nproc = 0 nproc = 0
nprocs = 1 nprocs = 1
npmax = 0
pdims(:) = 1 pdims(:) = 1
pcoords(:) = 0 pcoords(:) = 0
pparity(:) = 0 pparity(:) = 0
@ -156,6 +157,10 @@ module mpitools
! !
master = (nproc .eq. 0) master = (nproc .eq. 0)
! calculate the index of the last processor
!
npmax = nprocs - 1
! store the MPI pool handles ! store the MPI pool handles
! !
comm3d = mpi_comm_world comm3d = mpi_comm_world