Format and spelling

Author: Daniel Vickers

src/simulation/m_global_parameters.fpp

@@ -862,9 +862,9 @@ contains
 
         do i = 1, num_patches_max
             patch_ib(i)%geometry = dflt_int
-            patch_ib(i)%x_centroid = dflt_real
-            patch_ib(i)%y_centroid = dflt_real
-            patch_ib(i)%z_centroid = dflt_real
+            patch_ib(i)%x_centroid = 0._wp
+            patch_ib(i)%y_centroid = 0._wp
+            patch_ib(i)%z_centroid = 0._wp
             patch_ib(i)%length_x = dflt_real
             patch_ib(i)%length_y = dflt_real
             patch_ib(i)%length_z = dflt_real

src/simulation/m_ib_patches.fpp

@@ -899,18 +899,17 @@ contains
         type(t_model), pointer :: model
 
         real(wp) :: eta
-        real(wp), dimension(1:3) :: point, local_point
+        real(wp), dimension(1:3) :: point, local_point, offset
         real(wp), dimension(1:3) :: center, xyz_local
         real(wp), dimension(1:3, 1:3) :: inverse_rotation
 
         model => models(patch_id)%model
         center = 0._wp
-        if (.not. f_is_default(patch_ib(patch_id)%x_centroid)) center(1) = patch_ib(patch_id)%x_centroid
-        if (.not. f_is_default(patch_ib(patch_id)%y_centroid)) center(2) = patch_ib(patch_id)%y_centroid
-        if (p > 0) then
-            if (.not. f_is_default(patch_ib(patch_id)%z_centroid)) center(3) = patch_ib(patch_id)%z_centroid
-        end if
+        center(1) = patch_ib(patch_id)%x_centroid
+        center(2) = patch_ib(patch_id)%y_centroid
+        if (p > 0) center(3) = patch_ib(patch_id)%z_centroid
         inverse_rotation(:, :) = patch_ib(patch_id)%rotation_matrix_inverse(:, :)
+        offset(:) = patch_ib(patch_id)%centroid_offset(:)
 
         do i = 0, m
             do j = 0, n
@@ -921,6 +920,7 @@ contains
                         xyz_local(3) = z_cc(k) - center(3)
                     end if
                     xyz_local = matmul(inverse_rotation, xyz_local)
+                    xyz_local = xyz_local - offset
 
                     if (grid_geometry == 3) then
                         xyz_local = f_convert_cyl_to_cart(xyz_local)

src/simulation/m_ibm.fpp

@@ -92,9 +92,7 @@ contains
                 moving_immersed_boundary_flag = .true.
             end if
             call s_update_ib_rotation_matrix(i)
-            call s_compute_centroid_offset(i)
         end do
-        ! $:GPU_ENTER_DATA(copyin='[patch_ib(1:num_ibs)]')
         $:GPU_UPDATE(device='[patch_ib(1:num_ibs)]')
 
         ! GPU routines require updated cell centers
@@ -109,8 +107,12 @@ contains
         ! recompute the new ib_patch locations and broadcast them.
         ib_markers%sf = 0._wp
         call s_apply_ib_patches(ib_markers%sf(0:m, 0:n, 0:p))
-        call s_populate_ib_buffers()
         $:GPU_UPDATE(device='[ib_markers%sf]')
+        call s_populate_ib_buffers()
+        $:GPU_UPDATE(host='[ib_markers%sf]')
+        do i = 1, num_ibs
+            if (patch_ib(i)%moving_ibm /= 0) call s_compute_centroid_offset(i) ! offsets are computed after IB markers are generated
+        end do
 
         ! find the number of ghost points and set them to be the maximum total across ranks
         call s_find_num_ghost_points(num_gps, num_inner_gps)