Skip to content

Commit 3986b6f

Browse files
mohdsaid497566Malmahrouqi3
mohdsaid497566
authored and
Malmahrouqi3
committed
refactored s_finalize_riemann_solver
1 parent 334720f commit 3986b6f

File tree

1 file changed

+38
-105
lines changed

1 file changed

+38
-105
lines changed

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 38 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -3598,144 +3598,77 @@ contains
35983598
! Reshaping Outputted Data in y-direction
35993599
if (norm_dir == 2) then
36003600
!$acc parallel loop collapse(4) gang vector default(present)
3601-
do i = 1, sys_size
3602-
do l = is3%beg, is3%end
3603-
do j = is1%beg, is1%end
3604-
do k = is2%beg, is2%end
3605-
flux_vf(i)%sf(k, j, l) = &
3606-
flux_rsy_vf(j, k, l, i)
3607-
end do
3608-
end do
3609-
end do
3610-
end do
3611-
3612-
if (cyl_coord) then
3613-
!$acc parallel loop collapse(4) gang vector default(present)
3614-
do i = 1, sys_size
3615-
do l = is3%beg, is3%end
3616-
do j = is1%beg, is1%end
3617-
do k = is2%beg, is2%end
3618-
flux_gsrc_vf(i)%sf(k, j, l) = &
3619-
flux_gsrc_rsy_vf(j, k, l, i)
3620-
end do
3621-
end do
3622-
end do
3623-
end do
3624-
end if
3625-
3626-
!$acc parallel loop collapse(3) gang vector default(present)
36273601
do l = is3%beg, is3%end
36283602
do j = is1%beg, is1%end
36293603
do k = is2%beg, is2%end
36303604
flux_src_vf(advxb)%sf(k, j, l) = &
36313605
flux_src_rsy_vf(j, k, l, advxb)
3632-
end do
3633-
end do
3634-
end do
3635-
3636-
if (riemann_solver == 1 .or. riemann_solver == 4) then
3637-
!$acc parallel loop collapse(4) gang vector default(present)
3638-
do i = advxb + 1, advxe
3639-
do l = is3%beg, is3%end
3640-
do j = is1%beg, is1%end
3641-
do k = is2%beg, is2%end
3642-
flux_src_vf(i)%sf(k, j, l) = &
3643-
flux_src_rsy_vf(j, k, l, i)
3644-
end do
3606+
do i = 1, sys_size
3607+
flux_vf(i)%sf(k, j, l) = &
3608+
flux_rsy_vf(j, k, l, i)
3609+
if (cyl_coord) then
3610+
flux_gsrc_vf(i)%sf(k, j, l) = &
3611+
flux_gsrc_rsy_vf(j, k, l, i)
3612+
end if
36453613
end do
36463614
end do
36473615
end do
3616+
end do
36483617

3649-
end if
3650-
! Reshaping Outputted Data in z-direction
3618+
! Reshaping Outputted Data in z-direction
36513619
elseif (norm_dir == 3) then
36523620
!$acc parallel loop collapse(4) gang vector default(present)
3653-
do i = 1, sys_size
36543621
do j = is1%beg, is1%end
36553622
do k = is2%beg, is2%end
36563623
do l = is3%beg, is3%end
3657-
3658-
flux_vf(i)%sf(l, k, j) = &
3659-
flux_rsz_vf(j, k, l, i)
3660-
end do
3661-
end do
3662-
end do
3663-
end do
3664-
if (grid_geometry == 3) then
3665-
!$acc parallel loop collapse(4) gang vector default(present)
3666-
do i = 1, sys_size
3667-
do j = is1%beg, is1%end
3668-
do k = is2%beg, is2%end
3669-
do l = is3%beg, is3%end
3670-
3671-
flux_gsrc_vf(i)%sf(l, k, j) = &
3672-
flux_gsrc_rsz_vf(j, k, l, i)
3624+
flux_src_vf(advxb)%sf(l, k, j) = &
3625+
flux_src_rsz_vf(j, k, l, advxb)
3626+
do i = 1, sys_size
3627+
flux_vf(i)%sf(l, k, j) = &
3628+
flux_rsz_vf(j, k, l, i)
3629+
if (grid_geometry == 3) then
3630+
flux_gsrc_vf(i)%sf(l, k, j) = &
3631+
flux_gsrc_rsz_vf(j, k, l, i)
3632+
end if
36733633
end do
3674-
end do
3675-
end do
3676-
end do
3677-
end if
3678-
3679-
!$acc parallel loop collapse(3) gang vector default(present)
3680-
do j = is1%beg, is1%end
3681-
do k = is2%beg, is2%end
3682-
do l = is3%beg, is3%end
3683-
flux_src_vf(advxb)%sf(l, k, j) = &
3684-
flux_src_rsz_vf(j, k, l, advxb)
36853634
end do
36863635
end do
36873636
end do
36883637

3689-
if (riemann_solver == 1 .or. riemann_solver == 4) then
3690-
!$acc parallel loop collapse(4) gang vector default(present)
3691-
do i = advxb + 1, advxe
3692-
do j = is1%beg, is1%end
3693-
do k = is2%beg, is2%end
3694-
do l = is3%beg, is3%end
3695-
flux_src_vf(i)%sf(l, k, j) = &
3696-
flux_src_rsz_vf(j, k, l, i)
3697-
end do
3698-
end do
3699-
end do
3700-
end do
3701-
3702-
end if
37033638
elseif (norm_dir == 1) then
37043639
!$acc parallel loop collapse(4) gang vector default(present)
3705-
do i = 1, sys_size
3706-
do l = is3%beg, is3%end
3707-
do k = is2%beg, is2%end
3708-
do j = is1%beg, is1%end
3709-
flux_vf(i)%sf(j, k, l) = &
3710-
flux_rsx_vf(j, k, l, i)
3711-
end do
3712-
end do
3713-
end do
3714-
end do
3715-
3716-
!$acc parallel loop collapse(3) gang vector default(present)
37173640
do l = is3%beg, is3%end
37183641
do k = is2%beg, is2%end
37193642
do j = is1%beg, is1%end
37203643
flux_src_vf(advxb)%sf(j, k, l) = &
37213644
flux_src_rsx_vf(j, k, l, advxb)
3645+
do i = 1, sys_size
3646+
flux_vf(i)%sf(j, k, l) = &
3647+
flux_rsx_vf(j, k, l, i)
3648+
end do
37223649
end do
37233650
end do
37243651
end do
3725-
3726-
if (riemann_solver == 1 .or. riemann_solver == 4) then
3727-
!$acc parallel loop collapse(4) gang vector default(present)
3728-
do i = advxb + 1, advxe
3729-
do l = is3%beg, is3%end
3652+
3653+
if (riemann_solver == 1 .or. riemann_solver == 4) then
3654+
!$acc parallel loop collapse(4) gang vector default(present)
3655+
do i = advxb + 1, advxe
3656+
do l = is3%beg, is3%end
3657+
do j = is1%beg, is1%end
37303658
do k = is2%beg, is2%end
3731-
do j = is1%beg, is1%end
3732-
flux_src_vf(i)%sf(j, k, l) = &
3733-
flux_src_rsx_vf(j, k, l, i)
3734-
end do
3659+
if (norm_dir == 2) then
3660+
flux_src_vf(i)%sf(k, j, l) = &
3661+
flux_src_rsy_vf(j, k, l, i)
3662+
else if (norm_dir == 3) then
3663+
flux_src_vf(i)%sf(l, k, j) = &
3664+
flux_src_rsz_vf(j, k, l, i)
3665+
else if (norm_dir == 1) then
3666+
flux_src_vf(i)%sf(j, k, l) = &
3667+
flux_src_rsx_vf(j, k, l, i)
37353668
end do
37363669
end do
37373670
end do
3738-
end if
3671+
end do
37393672
end if
37403673

37413674
end subroutine s_finalize_riemann_solver

0 commit comments

Comments
 (0)