Skip to content

Commit 4b67dfa

Browse files
prathi-windprathi-wind
committed
Fixed some incorrect merging
1 parent b5b410c commit 4b67dfa

File tree

3 files changed

+34
-88
lines changed

3 files changed

+34
-88
lines changed

‎src/simulation/m_rhs.fpp‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -881,9 +881,6 @@ contains
881881
irx%beg = 0; iry%beg = 0; irz%beg = -1
882882
end if
883883
irx%end = m; iry%end = n; irz%end = p
884-
! $:GPU_UPDATE(host='[qL_rsx_vf,qR_rsx_vf]')
885-
! print *, "L", qL_rsx_vf(100:300, 0, 0, 1)
886-
! print *, "R", qR_rsx_vf(100:300, 0, 0, 1)
887884

888885
!Computing Riemann Solver Flux and Source Flux
889886
call nvtxStartRange("RHS-RIEMANN-SOLVER")
@@ -904,9 +901,6 @@ contains
904901
id, irx, iry, irz)
905902
call nvtxEndRange
906903

907-
!$:GPU_UPDATE(host='[flux_n(1)%vf(1)%sf]')
908-
!print *, "FLUX", flux_n(1)%vf(1)%sf(100:300, 0, 0)
909-
910904
! Additional physics and source terms
911905
! RHS addition for advection source
912906
call nvtxStartRange("RHS-ADVECTION-SRC")
@@ -1134,8 +1128,7 @@ contains
11341128
end do
11351129
end do
11361130
#:endcall GPU_PARALLEL_LOOP
1137-
! $:GPU_UPDATE(host='[rhs_vf(1)%sf]')
1138-
! print *, "RHS", rhs_vf(1)%sf(100:300, 0, 0)
1131+
11391132
if (model_eqns == 3) then
11401133
#:call GPU_PARALLEL_LOOP(collapse=4,private='[inv_ds,advected_qty_val, pressure_val,flux_face1,flux_face2]')
11411134
do q_loop = 0, p
@@ -1781,21 +1774,41 @@ contains
17811774
#:endcall GPU_PARALLEL_LOOP
17821775
end if
17831776

1784-
#:call GPU_PARALLEL_LOOP(collapse=3)
1785-
do l = 0, p
1786-
do k = 0, n
1787-
do j = 0, m
1788-
$:GPU_LOOP(parallelism='[seq]')
1789-
do i = momxb, E_idx
1790-
rhs_vf(i)%sf(j, k, l) = &
1791-
rhs_vf(i)%sf(j, k, l) + 1._wp/dz(l)* &
1792-
(flux_src_n_in(i)%sf(j, k, l - 1) &
1793-
- flux_src_n_in(i)%sf(j, k, l))
1777+
if ((surface_tension .or. viscous) .or. chem_params%diffusion) then
1778+
#:call GPU_PARALLEL_LOOP(collapse=3)
1779+
do l = 0, p
1780+
do k = 0, n
1781+
do j = 0, m
1782+
if (surface_tension .or. viscous) then
1783+
$:GPU_LOOP(parallelism='[seq]')
1784+
do i = momxb, E_idx
1785+
rhs_vf(i)%sf(j, k, l) = &
1786+
rhs_vf(i)%sf(j, k, l) + 1._wp/dz(l)* &
1787+
(flux_src_n_in(i)%sf(j, k, l - 1) &
1788+
- flux_src_n_in(i)%sf(j, k, l))
1789+
end do
1790+
end if
1791+
1792+
if (chem_params%diffusion) then
1793+
$:GPU_LOOP(parallelism='[seq]')
1794+
do i = chemxb, chemxe
1795+
rhs_vf(i)%sf(j, k, l) = &
1796+
rhs_vf(i)%sf(j, k, l) + 1._wp/dz(l)* &
1797+
(flux_src_n_in(i)%sf(j, k, l - 1) &
1798+
- flux_src_n_in(i)%sf(j, k, l))
1799+
end do
1800+
if (.not. viscous) then
1801+
rhs_vf(E_idx)%sf(j, k, l) = &
1802+
rhs_vf(E_idx)%sf(j, k, l) + 1._wp/dz(l)* &
1803+
(flux_src_n_in(E_idx)%sf(j, k, l - 1) &
1804+
- flux_src_n_in(E_idx)%sf(j, k, l))
1805+
end if
1806+
end if
17941807
end do
17951808
end do
17961809
end do
1797-
end do
1798-
#:endcall GPU_PARALLEL_LOOP
1810+
#:endcall GPU_PARALLEL_LOOP
1811+
end if
17991812

18001813
if (grid_geometry == 3) then
18011814
#:call GPU_PARALLEL_LOOP(collapse=3)

‎src/simulation/m_riemann_solvers.fpp‎

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,38 +1263,6 @@ contains
12631263
Re_R(i) = 1._wp/max(Re_R(i), sgm_eps)
12641264
end do
12651265
end if
1266-
if (viscous) then
1267-
$:GPU_LOOP(parallelism='[seq]')
1268-
do i = 1, 2
1269-
Re_L(i) = dflt_real
1270-
1271-
if (Re_size(i) > 0) Re_L(i) = 0._wp
1272-
1273-
$:GPU_LOOP(parallelism='[seq]')
1274-
do q = 1, Re_size(i)
1275-
Re_L(i) = qL_prim_rs${XYZ}$_vf(j, k, l, E_idx + Re_idx(i, q))/Res_gs(i, q) &
1276-
+ Re_L(i)
1277-
end do
1278-
1279-
Re_L(i) = 1._wp/max(Re_L(i), sgm_eps)
1280-
1281-
end do
1282-
1283-
$:GPU_LOOP(parallelism='[seq]')
1284-
do i = 1, 2
1285-
Re_R(i) = dflt_real
1286-
1287-
if (Re_size(i) > 0) Re_R(i) = 0._wp
1288-
1289-
$:GPU_LOOP(parallelism='[seq]')
1290-
do q = 1, Re_size(i)
1291-
Re_R(i) = qR_prim_rs${XYZ}$_vf(j + 1, k, l, E_idx + Re_idx(i, q))/Res_gs(i, q) &
1292-
+ Re_R(i)
1293-
end do
1294-
1295-
Re_R(i) = 1._wp/max(Re_R(i), sgm_eps)
1296-
end do
1297-
end if
12981266

12991267
E_L = gamma_L*pres_L + pi_inf_L + 5.e-1_wp*rho_L*vel_L_rms + qv_L
13001268
E_R = gamma_R*pres_R + pi_inf_R + 5.e-1_wp*rho_R*vel_R_rms + qv_R
@@ -3655,22 +3623,6 @@ contains
36553623
#:endcall GPU_PARALLEL_LOOP
36563624
end if
36573625

3658-
if (chem_params%diffusion) then
3659-
#:call GPU_PARALLEL_LOOP(collapse=4)
3660-
do i = E_idx, chemxe
3661-
do l = is3%beg, is3%end
3662-
do k = is2%beg, is2%end
3663-
do j = is1%beg, is1%end
3664-
if (i == E_idx .or. i >= chemxb) then
3665-
flux_src_vf(i)%sf(j, k, l) = 0._wp
3666-
end if
3667-
end do
3668-
end do
3669-
end do
3670-
end do
3671-
#:endcall GPU_PARALLEL_LOOP
3672-
end if
3673-
36743626
if (qbmm) then
36753627
#:call GPU_PARALLEL_LOOP(collapse=4)
36763628
do i = 1, 4
@@ -3765,22 +3717,6 @@ contains
37653717
#:endcall GPU_PARALLEL_LOOP
37663718
end if
37673719

3768-
if (chem_params%diffusion) then
3769-
#:call GPU_PARALLEL_LOOP(collapse=4)
3770-
do i = E_idx, chemxe
3771-
do j = is1%beg, is1%end
3772-
do k = is2%beg, is2%end
3773-
do l = is3%beg, is3%end
3774-
if (i == E_idx .or. i >= chemxb) then
3775-
flux_src_vf(i)%sf(l, k, j) = 0._wp
3776-
end if
3777-
end do
3778-
end do
3779-
end do
3780-
end do
3781-
#:endcall GPU_PARALLEL_LOOP
3782-
end if
3783-
37843720
if (qbmm) then
37853721
#:call GPU_PARALLEL_LOOP(collapse=4)
37863722
do i = 1, 4

‎src/simulation/m_start_up.fpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,17 +1498,14 @@ contains
14981498
$:GPU_UPDATE(device='[sigma, surface_tension]')
14991499

15001500
$:GPU_UPDATE(device='[dx,dy,dz,x_cb,x_cc,y_cb,y_cc,z_cb,z_cc]')
1501-
! #if defined(MFC_OpenACC)
1501+
15021502
$:GPU_UPDATE(device='[bc_x%vb1,bc_x%vb2,bc_x%vb3,bc_x%ve1,bc_x%ve2,bc_x%ve3]')
15031503
$:GPU_UPDATE(device='[bc_y%vb1,bc_y%vb2,bc_y%vb3,bc_y%ve1,bc_y%ve2,bc_y%ve3]')
15041504
$:GPU_UPDATE(device='[bc_z%vb1,bc_z%vb2,bc_z%vb3,bc_z%ve1,bc_z%ve2,bc_z%ve3]')
15051505

15061506
$:GPU_UPDATE(device='[bc_x%grcbc_in,bc_x%grcbc_out,bc_x%grcbc_vel_out]')
15071507
$:GPU_UPDATE(device='[bc_y%grcbc_in,bc_y%grcbc_out,bc_y%grcbc_vel_out]')
15081508
$:GPU_UPDATE(device='[bc_z%grcbc_in,bc_z%grcbc_out,bc_z%grcbc_vel_out]')
1509-
! #elif defined(MFC_OpenMP)
1510-
! $:GPU_UPDATE(device='[bc_x,bc_y,bc_z]')
1511-
! #endif
15121509

15131510
$:GPU_UPDATE(device='[relax, relax_model]')
15141511
if (relax) then

0 commit comments

Comments
 (0)