Skip to content
This repository was archived by the owner on Oct 23, 2020. It is now read-only.

Fix issue with halo exchanges of integer fields when running with RKIND=4 #931

Merged
douglasjacobsen merged 1 commit into from
May 5, 2016
Merged

Fix issue with halo exchanges of integer fields when running with RKIND=4 #931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/framework/mpas_dmpar.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7900,7 +7900,8 @@ subroutine mpas_dmpar_exch_group_pack_buffer_field1d_integer(exchangeGroup, fiel
!$omp do schedule(runtime) private(iBuffer)
do iExch = 1, exchListPtr % nList
iBuffer = exchListPtr % destList(iExch) + bufferOffset
commListPtr % rbuffer(iBuffer) = real(fieldCursor % array(exchListPtr % srcList(iExch)), kind=RKIND)
commListPtr % rbuffer(iBuffer) = transfer(fieldCursor % array(exchListPtr % srcList(iExch)), &
commListPtr % rbuffer(1))
end do
!$omp end do
nAdded = nAdded + exchListPtr % nList
Expand Down Expand Up @@ -7963,7 +7964,8 @@ subroutine mpas_dmpar_exch_group_pack_buffer_field2d_integer(exchangeGroup, fiel
do iExch = 1, exchListPtr % nList
do j = 1, fieldCursor % dimSizes(1)
iBuffer = (exchListPtr % destList(iExch)-1) * fieldCursor % dimSizes(1) + j + bufferOffset
commListPtr % rbuffer(iBuffer) = real(fieldCursor % array(j, exchListPtr % srcList(iExch)), kind=RKIND)
commListPtr % rbuffer(iBuffer) = transfer(fieldCursor % array(j, exchListPtr % srcList(iExch)), &
commListPtr % rbuffer(1))
end do
end do
!$omp end do
Expand Down Expand Up @@ -8029,7 +8031,8 @@ subroutine mpas_dmpar_exch_group_pack_buffer_field3d_integer(exchangeGroup, fiel
do k = 1, fieldCursor % dimSizes(1)
iBuffer = (exchListPtr % destList(iExch) - 1) * fieldCursor % dimSizes(1) * fieldCursor % dimSizes(2) &
+ (j - 1) * fieldCursor % dimSizes(1) + k + bufferOffset
commListPtr % rbuffer(iBuffer) = real(fieldCursor % array(k, j, exchListPtr % srcList(iExch)), kind=RKIND)
commListPtr % rbuffer(iBuffer) = transfer(fieldCursor % array(k, j, exchListPtr % srcList(iExch)), &
commListPtr % rbuffer(1))
end do
end do
end do
Expand Down Expand Up @@ -8892,7 +8895,8 @@ subroutine mpas_dmpar_exch_group_unpack_buffer_field1d_integer(exchangeGroup, fi
!$omp do schedule(runtime) private(iBuffer)
do iExch = 1, exchListPtr % nList
iBuffer = exchListPtr % srcList(iExch) + bufferOffset
fieldCursor % array(exchListPtr % destList(iExch)) = int(commListPtr % rbuffer(iBuffer))
fieldCursor % array(exchListPtr % destList(iExch)) = transfer(commListPtr % rbuffer(iBuffer), &
fieldCursor % array(1))
end do
!$omp end do
nAdded = max(nAdded, maxval(exchListPtr % srcList))
Expand Down Expand Up @@ -8963,7 +8967,8 @@ subroutine mpas_dmpar_exch_group_unpack_buffer_field2d_integer(exchangeGroup, fi
do iExch = 1, exchListPtr % nList
do j = 1, fieldCursor % dimSizes(1)
iBuffer = (exchListPtr % srcList(iExch)-1) * fieldCursor % dimSizes(1) + j + bufferOffset
fieldCursor % array(j, exchListPtr % destList(iExch)) = int(commListPtr % rbuffer(iBuffer))
fieldCursor % array(j, exchListPtr % destList(iExch)) = transfer(commListPtr % rbuffer(iBuffer), &
fieldCursor % array(1,1))
end do
end do
!$omp end do
Expand Down Expand Up @@ -9037,7 +9042,8 @@ subroutine mpas_dmpar_exch_group_unpack_buffer_field3d_integer(exchangeGroup, fi
do k = 1, fieldCursor % dimSizes(1)
iBuffer = (exchListPtr % srcList(iExch) - 1) * fieldCursor % dimSizes(1) * fieldCursor % dimSizes(2) &
+ (j - 1) * fieldCursor % dimSizes(1) + k + bufferOffset
fieldCursor % array(k, j, exchListPtr % destList(iExch)) = int(commListPtr % rbuffer(iBuffer))
fieldCursor % array(k, j, exchListPtr % destList(iExch)) = transfer(commListPtr % rbuffer(iBuffer), &
fieldCursor % array(1,1,1))
end do
end do
end do
Expand Down