Skip to content

Commit 60f5063

Browse files
committed
s_initialize_riemann_solver
1 parent 09d1287 commit 60f5063

File tree

1 file changed

+25
-77
lines changed

1 file changed

+25
-77
lines changed

src/simulation/m_riemann_solvers.fpp

Lines changed: 25 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -3829,94 +3829,42 @@ contains
38293829
38303830
! Reshaping Inputted Data in x-direction
38313831
3832-
if (norm_dir == 1) then
3833-
3834-
if (viscous .or. (surface_tension)) then
3835-
3836-
!$acc parallel loop collapse(4) gang vector default(present)
3837-
do i = momxb, E_idx
3838-
do l = is3%beg, is3%end
3839-
do k = is2%beg, is2%end
3840-
do j = is1%beg, is1%end
3841-
flux_src_vf(i)%sf(j, k, l) = 0._wp
3842-
end do
3843-
end do
3844-
end do
3845-
end do
3846-
end if
3847-
3848-
if (qbmm) then
3849-
3850-
!$acc parallel loop collapse(4) gang vector default(present)
3851-
do i = 1, 4
3852-
do l = is3%beg, is3%end
3853-
do k = is2%beg, is2%end
3854-
do j = is1%beg, is1%end + 1
3855-
mom_sp_rsx_vf(j, k, l, i) = mom_sp(i)%sf(j, k, l)
3856-
end do
3857-
end do
3858-
end do
3859-
end do
3860-
end if
3861-
3862-
! Reshaping Inputted Data in y-direction
3863-
elseif (norm_dir == 2) then
3864-
3865-
if (viscous .or. (surface_tension)) then
3866-
!$acc parallel loop collapse(4) gang vector default(present)
3867-
do i = momxb, E_idx
3868-
do l = is3%beg, is3%end
3832+
if (viscous .or. (surface_tension)) then
3833+
!$acc parallel loop collapse(4) gang vector default(present)
3834+
do i = momxb, E_idx
3835+
do l = is3%beg, is3%end
3836+
do k = is2%beg, is2%end
38693837
do j = is1%beg, is1%end
3870-
do k = is2%beg, is2%end
3838+
if (norm_dir == 1) then
3839+
flux_src_vf(i)%sf(j, k, l) = 0._wp
3840+
else if (norm_dir == 2) then
38713841
flux_src_vf(i)%sf(k, j, l) = 0._wp
3872-
end do
3873-
end do
3874-
end do
3875-
end do
3876-
end if
3877-
3878-
if (qbmm) then
3879-
!$acc parallel loop collapse(4) gang vector default(present)
3880-
do i = 1, 4
3881-
do l = is3%beg, is3%end
3882-
do k = is2%beg, is2%end
3883-
do j = is1%beg, is1%end + 1
3884-
mom_sp_rsy_vf(j, k, l, i) = mom_sp(i)%sf(k, j, l)
3885-
end do
3886-
end do
3887-
end do
3888-
end do
3889-
end if
3890-
3891-
! Reshaping Inputted Data in z-direction
3892-
else
3893-
3894-
if (viscous .or. (surface_tension)) then
3895-
!$acc parallel loop collapse(4) gang vector default(present)
3896-
do i = momxb, E_idx
3897-
do j = is1%beg, is1%end
3898-
do k = is2%beg, is2%end
3899-
do l = is3%beg, is3%end
3842+
else if (norm_dir == 3) then
39003843
flux_src_vf(i)%sf(l, k, j) = 0._wp
3901-
end do
3844+
end if
39023845
end do
39033846
end do
39043847
end do
3905-
end if
3848+
end do
3849+
end if
39063850
3907-
if (qbmm) then
3908-
!$acc parallel loop collapse(4) gang vector default(present)
3909-
do i = 1, 4
3910-
do l = is3%beg, is3%end
3911-
do k = is2%beg, is2%end
3912-
do j = is1%beg, is1%end + 1
3851+
if (qbmm) then
3852+
!$acc parallel loop collapse(4) gang vector default(present)
3853+
do i = 1, 4
3854+
do l = is3%beg, is3%end
3855+
do k = is2%beg, is2%end
3856+
do j = is1%beg, is1%end + 1
3857+
if (norm_dir == 1) then
3858+
mom_sp_rsx_vf(j, k, l, i) = mom_sp(i)%sf(j, k, l)
3859+
else if (norm_dir == 2) then
3860+
mom_sp_rsy_vf(j, k, l, i) = mom_sp(i)%sf(k, j, l)
3861+
else if (norm_dir == 3) then
39133862
mom_sp_rsz_vf(j, k, l, i) = mom_sp(i)%sf(l, k, j)
3914-
end do
3863+
end if
39153864
end do
39163865
end do
39173866
end do
3918-
end if
3919-
3867+
end do
39203868
end if
39213869
39223870
end subroutine s_initialize_riemann_solver

0 commit comments

Comments
 (0)