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

IO: Use bcells instead of im, jm, km.

Browse Source 
Signed-off-by: Grzegorz Kowal <grzegorz@amuncode.org>
This commit is contained in:
Grzegorz Kowal 2019-02-05 11:02:35 -02:00
parent 2f41bdabf2
commit af62878ba9
1 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
sources/io.F90
View File

@ -2777,7 +2777,7 @@ module io
use blocks , only : ndims
use blocks , only : block_meta, block_data, list_data
use blocks , only : get_dblocks
use coordinates , only : im, jm, km
use coordinates , only : nb => bcells
use equations , only : nv
use hdf5 , only : hid_t, hsize_t
use hdf5 , only : h5gcreate_f, h5gclose_f
@ -2805,7 +2805,7 @@ module io
! local arrays
!
integer(hsize_t), dimension(4) :: dm
integer(hsize_t), dimension(4) :: dm = 1
! local parameters
!
@ -2829,9 +2829,11 @@ module io
! prepate the dimensions
!
dm(1) = nv
dm(2) = im
dm(3) = jm
dm(4) = km
dm(2) = nb
dm(3) = nb
#if NDIMS == 3
dm(4) = nb
#endif /* NDIMS == 3 */
! reset the block counter
!
@ -2927,7 +2929,7 @@ module io
!
use blocks , only : block_meta, block_data, list_data
use blocks , only : append_datablock, link_blocks
use coordinates , only : im, jm, km
use coordinates , only : nb => bcells
use equations , only : nv
use hdf5 , only : hid_t, hsize_t
use hdf5 , only : h5gopen_f, h5gclose_f, h5lexists_f
@ -2955,7 +2957,7 @@ module io
! local arrays
!
integer(hsize_t), dimension(5) :: dm
integer(hsize_t), dimension(5) :: dm = 1
! local allocatable arrays
!
@ -3001,9 +3003,11 @@ module io
!
dm(1) = dblocks
dm(2) = nv
dm(3) = im
dm(4) = jm
dm(5) = km
dm(3) = nb
dm(4) = nb
#if NDIMS == 3
dm(5) = nb
#endif /* NDIMS == 3 */
! check if the old data format is used, otherwise use the new one
!
@ -3305,7 +3309,7 @@ module io
!
use blocks , only : block_data, list_data
use blocks , only : get_dblocks
use coordinates , only : ni => ncells, im, jm, km
use coordinates , only : ni => ncells, nb => bcells
use coordinates , only : ib, jb, kb, ie, je, ke
use equations , only : nv, pvars
use hdf5 , only : hid_t, hsize_t
@ -3329,7 +3333,8 @@ module io
!
integer :: err
integer(kind=4) :: i, j, k, l, n
integer(kind=4) :: il, jl, kl, iu, ju, ku
integer(kind=4) :: il, jl, kl = 1
integer(kind=4) :: iu, ju, ku = 1
! local allocatable arrays
!
@ -3362,16 +3367,22 @@ module io
!
dm(1) = get_dblocks()
if (with_ghosts) then
dm(2) = im
dm(3) = jm
dm(4) = km
dm(2) = nb
dm(3) = nb
#if NDIMS == 3
dm(4) = nb
#endif /* NDIMS == 3 */
il = 1
jl = 1
#if NDIMS == 3
kl = 1
iu = im
ju = jm
ku = km
#endif /* NDIMS == 3 */
iu = nb
ju = nb
#if NDIMS == 3
ku = nb
#endif /* NDIMS == 3 */
else
dm(2) = ni
dm(3) = ni
@ -3381,10 +3392,14 @@ module io
il = ib
jl = jb
#if NDIMS == 3
kl = kb
#endif /* NDIMS == 3 */
iu = ie
ju = je
#if NDIMS == 3
ku = ke
#endif /* NDIMS == 3 */
end if
! allocate array to group a variable from all data blocks
@ -3483,7 +3498,7 @@ module io
!
use blocks , only : block_data, list_data
use blocks , only : get_dblocks
use coordinates , only : ni => ncells, im, jm, km
use coordinates , only : ni => ncells, nb => bcells
use coordinates , only : ib, jb, kb, ie, je, ke
use equations , only : nv, cvars
use hdf5 , only : hid_t, hsize_t
@ -3507,7 +3522,8 @@ module io
!
integer :: err
integer(kind=4) :: i, j, k, l, n
integer(kind=4) :: il, jl, kl, iu, ju, ku
integer(kind=4) :: il, jl, kl = 1
integer(kind=4) :: iu, ju, ku = 1
! local allocatable arrays
!
@ -3540,16 +3556,22 @@ module io
!
dm(1) = get_dblocks()
if (with_ghosts) then
dm(2) = im
dm(3) = jm
dm(4) = km
dm(2) = nb
dm(3) = nb
#if NDIMS == 3
dm(4) = nb
#endif /* NDIMS == 3 */
il = 1
jl = 1
#if NDIMS == 3
kl = 1
iu = im
ju = jm
ku = km
#endif /* NDIMS == 3 */
iu = nb
ju = nb
#if NDIMS == 3
ku = nb
#endif /* NDIMS == 3 */
else
dm(2) = ni
dm(3) = ni
@ -3559,10 +3581,14 @@ module io
il = ib
jl = jb
#if NDIMS == 3
kl = kb
#endif /* NDIMS == 3 */
iu = ie
ju = je
#if NDIMS == 3
ku = ke
#endif /* NDIMS == 3 */
end if
! allocate array to group a variable from all data blocks