Skip to content

Commit 09d1287

Browse files
Malmahrouqi3Malmahrouqi3
committed
fixed s_finalize_riemann_solver
1 parent db44da1 commit 09d1287

File tree

1 file changed

+36
-100
lines changed

1 file changed

+36
-100
lines changed

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 36 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -4303,147 +4303,83 @@ contains
43034303
43044304
! Reshaping Outputted Data in y-direction
43054305
if (norm_dir == 2) then
4306-
!$acc parallel loop collapse(4) gang vector default(present)
4307-
do i = 1, sys_size
4308-
do l = is3%beg, is3%end
4309-
do j = is1%beg, is1%end
4310-
do k = is2%beg, is2%end
4311-
flux_vf(i)%sf(k, j, l) = &
4312-
flux_rsy_vf(j, k, l, i)
4313-
end do
4314-
end do
4315-
end do
4316-
end do
4317-
4318-
if (cyl_coord) then
4319-
!$acc parallel loop collapse(4) gang vector default(present)
4320-
do i = 1, sys_size
4321-
do l = is3%beg, is3%end
4322-
do j = is1%beg, is1%end
4323-
do k = is2%beg, is2%end
4324-
flux_gsrc_vf(i)%sf(k, j, l) = &
4325-
flux_gsrc_rsy_vf(j, k, l, i)
4326-
end do
4327-
end do
4328-
end do
4329-
end do
4330-
end if
4331-
43324306
!$acc parallel loop collapse(3) gang vector default(present)
43334307
do l = is3%beg, is3%end
43344308
do j = is1%beg, is1%end
43354309
do k = is2%beg, is2%end
43364310
flux_src_vf(advxb)%sf(k, j, l) = &
43374311
flux_src_rsy_vf(j, k, l, advxb)
4338-
end do
4339-
end do
4340-
end do
4341-
4342-
if (riemann_solver == 1 .or. riemann_solver == 4) then
4343-
!$acc parallel loop collapse(4) gang vector default(present)
4344-
do i = advxb + 1, advxe
4345-
do l = is3%beg, is3%end
4346-
do j = is1%beg, is1%end
4347-
do k = is2%beg, is2%end
4348-
flux_src_vf(i)%sf(k, j, l) = &
4349-
flux_src_rsy_vf(j, k, l, i)
4350-
end do
4312+
do i = 1, sys_size
4313+
flux_vf(i)%sf(k, j, l) = &
4314+
flux_rsy_vf(j, k, l, i)
4315+
if (cyl_coord) then
4316+
flux_gsrc_vf(i)%sf(k, j, l) = &
4317+
flux_gsrc_rsy_vf(j, k, l, i)
4318+
end if
43514319
end do
43524320
end do
43534321
end do
4322+
end do
43544323
4355-
end if
43564324
! Reshaping Outputted Data in z-direction
43574325
elseif (norm_dir == 3) then
4358-
!$acc parallel loop collapse(4) gang vector default(present)
4359-
do i = 1, sys_size
4360-
do j = is1%beg, is1%end
4361-
do k = is2%beg, is2%end
4362-
do l = is3%beg, is3%end
4363-
4364-
flux_vf(i)%sf(l, k, j) = &
4365-
flux_rsz_vf(j, k, l, i)
4366-
end do
4367-
end do
4368-
end do
4369-
end do
4370-
if (grid_geometry == 3) then
4371-
!$acc parallel loop collapse(4) gang vector default(present)
4372-
do i = 1, sys_size
4373-
do j = is1%beg, is1%end
4374-
do k = is2%beg, is2%end
4375-
do l = is3%beg, is3%end
4376-
4377-
flux_gsrc_vf(i)%sf(l, k, j) = &
4378-
flux_gsrc_rsz_vf(j, k, l, i)
4379-
end do
4380-
end do
4381-
end do
4382-
end do
4383-
end if
4384-
43854326
!$acc parallel loop collapse(3) gang vector default(present)
43864327
do j = is1%beg, is1%end
43874328
do k = is2%beg, is2%end
43884329
do l = is3%beg, is3%end
43894330
flux_src_vf(advxb)%sf(l, k, j) = &
43904331
flux_src_rsz_vf(j, k, l, advxb)
4391-
end do
4392-
end do
4393-
end do
4394-
4395-
if (riemann_solver == 1 .or. riemann_solver == 4) then
4396-
!$acc parallel loop collapse(4) gang vector default(present)
4397-
do i = advxb + 1, advxe
4398-
do j = is1%beg, is1%end
4399-
do k = is2%beg, is2%end
4400-
do l = is3%beg, is3%end
4401-
flux_src_vf(i)%sf(l, k, j) = &
4402-
flux_src_rsz_vf(j, k, l, i)
4403-
end do
4404-
end do
4405-
end do
4406-
end do
4407-
4408-
end if
4409-
elseif (norm_dir == 1) then
4410-
!$acc parallel loop collapse(4) gang vector default(present)
4411-
do i = 1, sys_size
4412-
do l = is3%beg, is3%end
4413-
do k = is2%beg, is2%end
4414-
do j = is1%beg, is1%end
4415-
flux_vf(i)%sf(j, k, l) = &
4416-
flux_rsx_vf(j, k, l, i)
4332+
do i = 1, sys_size
4333+
flux_vf(i)%sf(l, k, j) = &
4334+
flux_rsz_vf(j, k, l, i)
4335+
if (grid_geometry == 3) then
4336+
flux_gsrc_vf(i)%sf(l, k, j) = &
4337+
flux_gsrc_rsz_vf(j, k, l, i)
4338+
end if
44174339
end do
44184340
end do
44194341
end do
44204342
end do
44214343
4344+
elseif (norm_dir == 1) then
44224345
!$acc parallel loop collapse(3) gang vector default(present)
44234346
do l = is3%beg, is3%end
44244347
do k = is2%beg, is2%end
44254348
do j = is1%beg, is1%end
44264349
flux_src_vf(advxb)%sf(j, k, l) = &
44274350
flux_src_rsx_vf(j, k, l, advxb)
4351+
do i = 1, sys_size
4352+
flux_vf(i)%sf(j, k, l) = &
4353+
flux_rsx_vf(j, k, l, i)
4354+
end do
44284355
end do
44294356
end do
44304357
end do
4358+
end if
44314359
4432-
if (riemann_solver == 1 .or. riemann_solver == 4) then
4433-
!$acc parallel loop collapse(4) gang vector default(present)
4434-
do i = advxb + 1, advxe
4435-
do l = is3%beg, is3%end
4360+
if (riemann_solver == 1 .or. riemann_solver == 4) then
4361+
!$acc parallel loop collapse(4) gang vector default(present)
4362+
do i = advxb + 1, advxe
4363+
do l = is3%beg, is3%end
4364+
do j = is1%beg, is1%end
44364365
do k = is2%beg, is2%end
4437-
do j = is1%beg, is1%end
4366+
if (norm_dir == 2) then
4367+
flux_src_vf(i)%sf(k, j, l) = &
4368+
flux_src_rsy_vf(j, k, l, i)
4369+
else if (norm_dir == 3) then
4370+
flux_src_vf(i)%sf(l, k, j) = &
4371+
flux_src_rsz_vf(j, k, l, i)
4372+
else if (norm_dir == 1) then
44384373
flux_src_vf(i)%sf(j, k, l) = &
44394374
flux_src_rsx_vf(j, k, l, i)
4440-
end do
4375+
end if
44414376
end do
44424377
end do
44434378
end do
4444-
end if
4379+
end do
44454380
end if
44464381
4382+
44474383
end subroutine s_finalize_riemann_solver
44484384
44494385
!> Module deallocation and/or disassociation procedures

0 commit comments

Comments
 (0)