Skip to content

Commit cf6be2f

Browse files
authored
Merge branch 'master' into feature/icpp-patch-rotations
2 parents 2b2d4ac + cd429e1 commit cf6be2f

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

src/simulation/m_data_output.fpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,6 +1062,8 @@ contains
10621062

10631063
integer, intent(in) :: time_step
10641064

1065+
$:GPU_UPDATE(host='[patch_ib(1:num_ibs)]')
1066+
10651067
if (parallel_io) then
10661068
call s_write_parallel_ib_state(time_step)
10671069
else

src/simulation/m_ibm.fpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -935,10 +935,10 @@ contains
935935
end do
936936
end if
937937

938-
$:GPU_PARALLEL_LOOP(private='[ib_idx, ib_idx_temp, encoded_ib_idx, fluid_idx, radial_vector, local_force_contribution, &
939-
& cell_volume, local_torque_contribution, dynamic_viscosity, viscous_stress_div, &
940-
& viscous_stress_div_1, viscous_stress_div_2, dx, dy, dz]', copy='[forces, torques]', &
941-
& copyin='[dynamic_viscosities]', collapse=3)
938+
$:GPU_PARALLEL_LOOP(private='[i, j, k, l, ib_idx, ib_idx_temp, encoded_ib_idx, fluid_idx, radial_vector, &
939+
& local_force_contribution, cell_volume, local_torque_contribution, dynamic_viscosity, &
940+
& viscous_stress_div, viscous_stress_div_1, viscous_stress_div_2, dx, dy, dz]', copy='[forces, &
941+
& torques]', copyin='[dynamic_viscosities]', collapse=3)
942942
do i = 0, m
943943
do j = 0, n
944944
do k = 0, p

src/simulation/m_start_up.fpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,6 +1494,13 @@ contains
14941494
call MPI_SENDRECV(end_val, 1, mpi_p, send_neighbor, ${TAG + 1}$, recv_val, 1, mpi_p, recv_neighbor, &
14951495
& ${TAG + 1}$, MPI_COMM_WORLD, MPI_STATUS_IGNORE, ierr)
14961496
end_val = recv_val
1497+
1498+
! protect from looping back around on yourself multiple times
1499+
if (f_approx_equal(beg_val, ${X}$_cb(${DIM}$)) .or. f_approx_equal(end_val, ${X}$_cb(-1))) then
1500+
beg_val = -huge(0._wp)
1501+
end_val = huge(0._wp)
1502+
exit
1503+
end if
14971504
end do
14981505
neighbor_domain_${X}$%beg = beg_val
14991506
neighbor_domain_${X}$%end = end_val

tests/coverage_map.json.gz

47 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)