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

MESH: Replace deallocate_datablock() with remove_datablock().

Browse Source 
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2013-12-23 17:44:36 -02:00
parent 42c39c5736
commit 853618b874
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/blocks.F90
View File

@ -480,7 +480,7 @@ module blocks
! if corresponding data block is allocated, deallocate it too ! if corresponding data block is allocated, deallocate it too
! !
if (associated(pmeta%data)) & if (associated(pmeta%data)) &
call deallocate_datablock(pmeta%data) call remove_datablock(pmeta%data)
! nullify pointers ! nullify pointers
! !

16
src/mesh.F90
View File

@ -150,7 +150,7 @@ module mesh
subroutine generate_mesh() subroutine generate_mesh()
use blocks , only : block_meta, block_data, list_meta, list_data use blocks , only : block_meta, block_data, list_meta, list_data
use blocks , only : refine_block, deallocate_datablock use blocks , only : refine_block, remove_datablock
use blocks , only : nchild, nsides, nfaces use blocks , only : nchild, nsides, nfaces
use blocks , only : get_mblocks, get_nleafs use blocks , only : get_mblocks, get_nleafs
use coordinates, only : minlev, maxlev, res use coordinates, only : minlev, maxlev, res
@ -346,7 +346,7 @@ module mesh
do while (associated(pmeta)) do while (associated(pmeta))
if (.not. pmeta%leaf) & if (.not. pmeta%leaf) &
call deallocate_datablock(pmeta%data) call remove_datablock(pmeta%data)
! assign pointer to the next block ! assign pointer to the next block
! !
@ -398,7 +398,7 @@ module mesh
! associated, deallocate its data field ! associated, deallocate its data field
! !
if (pmeta%cpu .ne. nproc .and. associated(pmeta%data)) & if (pmeta%cpu .ne. nproc .and. associated(pmeta%data)) &
call deallocate_datablock(pmeta%data) call remove_datablock(pmeta%data)
! assign pointer to the next block ! assign pointer to the next block
! !
@ -429,7 +429,7 @@ module mesh
use blocks , only : block_meta, block_data, list_meta, list_data & use blocks , only : block_meta, block_data, list_meta, list_data &
, nchild, ndims, nsides, nfaces & , nchild, ndims, nsides, nfaces &
, refine_block, derefine_block, append_datablock & , refine_block, derefine_block, append_datablock &
, associate_blocks, deallocate_datablock , associate_blocks, remove_datablock
use blocks , only : get_nleafs use blocks , only : get_nleafs
use coordinates, only : minlev, maxlev, toplev, im, jm, km, res use coordinates, only : minlev, maxlev, toplev, im, jm, km, res
use error , only : print_info, print_error use error , only : print_info, print_error
@ -794,7 +794,7 @@ module mesh
! deallocate data block ! deallocate data block
! !
call deallocate_datablock(pmeta%child(p)%ptr%data) call remove_datablock(pmeta%child(p)%ptr%data)
end if end if
! set the current processor of the block ! set the current processor of the block
@ -866,7 +866,7 @@ module mesh
#endif /* MPI */ #endif /* MPI */
call refine_block(pmeta, res(pmeta%level + 1,:), .true.) call refine_block(pmeta, res(pmeta%level + 1,:), .true.)
call prolong_block(pparent) call prolong_block(pparent)
call deallocate_datablock(pparent%data) call remove_datablock(pparent%data)
#ifdef MPI #ifdef MPI
else else
call refine_block(pmeta, res(pmeta%level + 1,:), .false.) call refine_block(pmeta, res(pmeta%level + 1,:), .false.)
@ -907,7 +907,7 @@ module mesh
subroutine redistribute_blocks() subroutine redistribute_blocks()
use blocks , only : block_meta, block_data, list_meta, list_data use blocks , only : block_meta, block_data, list_meta, list_data
use blocks , only : get_nleafs, append_datablock, deallocate_datablock & use blocks , only : get_nleafs, append_datablock, remove_datablock &
, associate_blocks , associate_blocks
use coordinates, only : im, jm, km use coordinates, only : im, jm, km
use mpitools , only : send_real_array, receive_real_array use mpitools , only : send_real_array, receive_real_array
@ -978,7 +978,7 @@ module mesh
! deallocate data block ! deallocate data block
! !
call deallocate_datablock(pmeta%data) call remove_datablock(pmeta%data)
! send data block ! send data block
! !