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

BLOCKS: Rename datablock_set_dims() to set_block_dimensions().

Browse Source 
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2014-01-16 17:58:28 -02:00
parent 17b7286345
commit b2dbb01cd8
2 changed files with 50 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/blocks.F90
View File

@ -264,6 +264,7 @@ module blocks
! declare public subroutines
!
public :: initialize_blocks, finalize_blocks
public :: set_block_dimensions
public :: append_metablock, remove_metablock
public :: append_datablock, remove_datablock
public :: allocate_metablock, deallocate_metablock
@ -274,7 +275,6 @@ module blocks
public :: metablock_set_id, metablock_set_cpu, metablock_set_refine &
, metablock_set_config, metablock_set_level, metablock_set_position &
, metablock_set_coord, metablock_set_bounds, metablock_set_leaf
public :: datablock_set_dims
#ifdef DEBUG
public :: check_metablock
#endif /* DEBUG */
@ -443,6 +443,53 @@ module blocks
!
!===============================================================================
!
! subroutine SET_BLOCK_DIMENSIONS:
! -------------------------------
!
! Subroutine sets the number of variables, fluxes and block dimensions
! (without ghost cells) for arrays allocated in data blocks.
!
! Arguments:
!
! nv - the number of variables stored in %u and %q;
! nf - the number of fluxes stored in %f;
! ni - the block dimension along X;
! nj - the block dimension along Y;
! nk - the block dimension along Z;
!
!===============================================================================
!
subroutine set_block_dimensions(nv, nf, ni, nj, nk)
! local variables are not implicit by default
!
implicit none
! subroutine arguments
!
integer(kind=4), intent(in) :: nv, nf, ni, nj, nk
!
!-------------------------------------------------------------------------------
!
! set the number of variables and fluxes
!
nvars = nv
nflux = nf
! set the block dimensions
!
nx = ni
ny = nj
#if NDIMS == 3
nz = nk
#endif /* NDIMS == 3 */
!-------------------------------------------------------------------------------
!
end subroutine set_block_dimensions
!
!===============================================================================
!
! subroutine APPEND_METABLOCK:
! ---------------------------
!
@ -2599,35 +2646,6 @@ module blocks
!
end subroutine metablock_set_bounds
!
!===============================================================================
!
! datablock_set_dims: subroutine sets the number of variables and dimensions
! for arrays allocated in data blocks
!
!===============================================================================
!
subroutine datablock_set_dims(nv, nf, ni, nj, nk)
implicit none
! input arguments
!
integer(kind=4), intent(in) :: nv, nf, ni, nj, nk
!
!-------------------------------------------------------------------------------
!
nvars = nv
nflux = nf
nx = ni
ny = nj
#if NDIMS == 3
nz = nk
#endif /* NDIMS == 3 */
!-------------------------------------------------------------------------------
!
end subroutine datablock_set_dims
!
#ifdef DEBUG
!!==============================================================================
!!

4
src/mesh.F90
View File

@ -86,7 +86,7 @@ module mesh
! import external procedures and variables
!
use blocks , only : datablock_set_dims
use blocks , only : set_block_dimensions
use coordinates , only : xmin, xmax, ymin, ymax, zmin, zmax
use coordinates , only : toplev, im, jm, km
use equations , only : nv
@ -131,7 +131,7 @@ module mesh
! set data block dimensions
!
call datablock_set_dims(nv, nv, im, jm, km)
call set_block_dimensions(nv, nv, im, jm, km)
! only master prepares the mesh statistics file
!