Skip to content

Commit 131b41e

Browse files
authored
Add IBM Slip tests (#791)
1 parent 03fbbe1 commit 131b41e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+3814
-185
lines changed

src/pre_process/m_mpi_proxy.fpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,10 @@ contains
108108
call MPI_BCAST(patch_ib(i)%model_spc, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
109109
110110
#:for VAR in [ 'x_centroid', 'y_centroid', 'z_centroid', &
111-
& 'length_x', 'length_y', 'length_z', 'radius', 'c', 'p', 't', 'm', 'theta', 'slip']
111+
& 'length_x', 'length_y', 'length_z', 'radius', 'c', 'p', 't', 'm', 'theta']
112112
call MPI_BCAST(patch_ib(i)%${VAR}$, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
113113
#:endfor
114+
call MPI_BCAST(patch_ib(i)%slip, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
114115
115116
#:for VAR in [ 'model_translate', 'model_scale', 'model_rotate']
116117
call MPI_BCAST(patch_ib(i)%${VAR}$, size(patch_ib(i)%${VAR}$), mpi_p, 0, MPI_COMM_WORLD, ierr)

src/simulation/m_ibm.fpp

+8-5
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,21 @@ contains
5454
@:ALLOCATE(ib_markers%sf(-gp_layers:m+gp_layers, &
5555
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers))
5656
@:ALLOCATE(levelset%sf(-gp_layers:m+gp_layers, &
57-
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers, num_ibs))
57+
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers, 1:num_ibs))
5858
@:ALLOCATE(levelset_norm%sf(-gp_layers:m+gp_layers, &
59-
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers, num_ibs, 3))
59+
-gp_layers:n+gp_layers, -gp_layers:p+gp_layers, 1:num_ibs, 1:3))
6060
else
6161
@:ALLOCATE(ib_markers%sf(-gp_layers:m+gp_layers, &
6262
-gp_layers:n+gp_layers, 0:0))
6363
@:ALLOCATE(levelset%sf(-gp_layers:m+gp_layers, &
64-
-gp_layers:n+gp_layers, 0:0, num_ibs))
64+
-gp_layers:n+gp_layers, 0:0, 1:num_ibs))
6565
@:ALLOCATE(levelset_norm%sf(-gp_layers:m+gp_layers, &
66-
-gp_layers:n+gp_layers, 0:0, num_ibs, 3))
66+
-gp_layers:n+gp_layers, 0:0, 1:num_ibs, 1:3))
6767
end if
6868

6969
@:ACC_SETUP_SFs(ib_markers)
7070
@:ACC_SETUP_SFs(levelset)
71+
@:ACC_SETUP_SFs(levelset_norm)
7172

7273
!$acc enter data copyin(num_gps, num_inner_gps)
7374

@@ -80,6 +81,8 @@ contains
8081
integer :: i, j, k
8182

8283
!$acc update device(ib_markers%sf)
84+
!$acc update device(levelset%sf)
85+
!$acc update device(levelset_norm%sf)
8386

8487
! Get neighboring IB variables from other processors
8588
call s_mpi_sendrecv_ib_buffers(ib_markers, gp_layers)
@@ -207,7 +210,7 @@ contains
207210

208211
! Calculate velocity of ghost cell
209212
if (gp%slip) then
210-
norm = levelset_norm%sf(gp%loc(1), gp%loc(2), gp%loc(3), gp%ib_patch_id, :)
213+
norm(1:3) = levelset_norm%sf(gp%loc(1), gp%loc(2), gp%loc(3), gp%ib_patch_id, 1:3)
211214
buf = sqrt(sum(norm**2))
212215
norm = norm/buf
213216
vel_norm_IP = sum(vel_IP*norm)*norm

tests/0387594F/golden-metadata.txt

+150
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/0387594F/golden.txt

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/07D9EBD1/golden-metadata.txt

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/16574715/golden-metadata.txt

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)