Skip to content

Commit a301fbc

Browse files
author
Daniel Vickers
committed
Modified all GPU parallel statements and ran formatting
1 parent e1591e3 commit a301fbc

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

src/common/m_compute_levelset.fpp

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ contains
4343
center(1) = patch_ib(ib_patch_id)%x_centroid
4444
center(2) = patch_ib(ib_patch_id)%y_centroid
4545

46-
$:GPU_PARALLEL_LOOP(private='[i,j,dist_vec,dist]', copy='[levelset%sf,levelset_norm%sf]',&
46+
$:GPU_PARALLEL_LOOP(private='[i,j,dist_vec,dist]', &
4747
& copyin='[ib_patch_id,center,radius]', collapse=2)
4848
do i = 0, m
4949
do j = 0, n
@@ -86,7 +86,7 @@ contains
8686
inverse_rotation(:, :) = patch_ib(ib_patch_id)%rotation_matrix_inverse(:, :)
8787
rotation(:, :) = patch_ib(ib_patch_id)%rotation_matrix(:, :)
8888

89-
$:GPU_PARALLEL_LOOP(private='[i,j,xy_local,k,dist_vec,dist,global_dist,global_id]', copy='[levelset%sf,levelset_norm%sf]',&
89+
$:GPU_PARALLEL_LOOP(private='[i,j,xy_local,k,dist_vec,dist,global_dist,global_id]', &
9090
& copyin='[ib_patch_id,center,rotation,inverse_rotation,airfoil_grid_u,airfoil_grid_l]', collapse=2)
9191
do i = 0, m
9292
do j = 0, n
@@ -178,7 +178,7 @@ contains
178178
z_max = center(3) + lz/2
179179
z_min = center(3) - lz/2
180180
181-
$:GPU_PARALLEL_LOOP(private='[i,j,l,xyz_local,k,dist_vec,dist,global_dist,global_id,dist_side,dist_surf]', copy='[levelset%sf,levelset_norm%sf]',&
181+
$:GPU_PARALLEL_LOOP(private='[i,j,l,xyz_local,k,dist_vec,dist,global_dist,global_id,dist_side,dist_surf]', &
182182
& copyin='[ib_patch_id,center,rotation,inverse_rotation,airfoil_grid_u,airfoil_grid_l,z_min,z_max]', collapse=3)
183183
do l = 0, p
184184
do j = 0, n
@@ -332,7 +332,6 @@ contains
332332
end do
333333
end do
334334

335-
336335
end subroutine s_rectangle_levelset
337336

338337
pure subroutine s_cuboid_levelset(ib_patch_id, levelset, levelset_norm)
@@ -370,7 +369,7 @@ contains
370369
Front = length_z/2
371370
Back = -length_z/2
372371

373-
$:GPU_PARALLEL_LOOP(private='[i,j,k,min_dist,side_dists,xyz_local,dist_vec]', copy='[levelset%sf,levelset_norm%sf]',&
372+
$:GPU_PARALLEL_LOOP(private='[i,j,k,min_dist,side_dists,xyz_local,dist_vec]', &
374373
& copyin='[ib_patch_id,center,inverse_rotation,rotation,Right,Left,Top,Bottom,Front,Back]', collapse=3)
375374
do i = 0, m
376375
do j = 0, n
@@ -459,7 +458,7 @@ contains
459458
center(2) = patch_ib(ib_patch_id)%y_centroid
460459
center(3) = patch_ib(ib_patch_id)%z_centroid
461460
462-
$:GPU_PARALLEL_LOOP(private='[i,j,k,dist_vec,dist]', copy='[levelset%sf,levelset_norm%sf]',&
461+
$:GPU_PARALLEL_LOOP(private='[i,j,k,dist_vec,dist]', &
463462
& copyin='[ib_patch_id,center,radius]', collapse=3)
464463
do i = 0, m
465464
do j = 0, n
@@ -523,7 +522,7 @@ contains
523522
dist_surface_vec = (/1, 1, 0/)
524523
end if
525524
526-
$:GPU_PARALLEL_LOOP(private='[i,j,k,side_pos,dist_side,dist_surface,xyz_local]', copy='[levelset%sf,levelset_norm%sf]',&
525+
$:GPU_PARALLEL_LOOP(private='[i,j,k,side_pos,dist_side,dist_surface,xyz_local]', &
527526
& copyin='[ib_patch_id,center,radius,inverse_rotation,rotation,dist_sides_vec,dist_surface_vec]', collapse=3)
528527
do i = 0, m
529528
do j = 0, n

0 commit comments

Comments
 (0)