Defering GPU STLs to a later PR

Author: danieljvickers

src/simulation/m_compute_levelset.fpp

@@ -52,9 +52,6 @@ contains
                     call s_cylinder_levelset(gps(i))
                 elseif (patch_geometry == 11) then
                     call s_3d_airfoil_levelset(gps(i))
-                    ! STL+IBM patch
-                elseif (patch_geometry == 12) then
-                    call s_model_levelset(gps(i))
                 end if
             end do
             $:END_GPU_PARALLEL_LOOP()
@@ -75,9 +72,6 @@ contains
                     call s_rectangle_levelset(gps(i))
                 elseif (patch_geometry == 4) then
                     call s_airfoil_levelset(gps(i))
-                    ! STL+IBM patch
-                elseif (patch_geometry == 5) then
-                    call s_model_levelset(gps(i))
                 elseif (patch_geometry == 6) then
                     call s_ellipse_levelset(gps(i))
                 end if
@@ -87,6 +81,17 @@ contains
 
         end if
 
+        ! STL models computed on the CPU for now
+        do i = 1, num_gps
+            patch_id = gps(i)%ib_patch_id
+            patch_geometry = patch_ib(patch_id)%geometry
+
+            if (patch_geometry == 5 .or. patch_geometry == 12) then
+                call s_model_levelset(gps(i))
+                $:GPU_UPDATE(device='[gps(i)]')
+            end if
+        end do
+
         $:GPU_UPDATE(host='[gps(1:num_gps)]')
 
     end subroutine s_apply_levelset

src/simulation/m_ib_patches.fpp

@@ -235,13 +235,6 @@ contains
                     models(patch_id)%total_vertices = total_vertices
                 end if
 
-                ! update allocatables
-                $:GPU_ENTER_DATA(copyin='[models(patch_id)]')
-                $:GPU_ENTER_DATA(copyin='[models(patch_id)%boundary_v]')
-                $:GPU_ENTER_DATA(copyin='[models(patch_id)%model%trs]')
-                if (interpolate) then
-                    $:GPU_ENTER_DATA(copyin='[models(patch_id)%interpolated_boundary_v]')
-                end if
             end if
         end do
 
@@ -925,8 +918,6 @@ contains
         end if
         inverse_rotation(:, :) = patch_ib(patch_id)%rotation_matrix_inverse(:, :)
 
-        ! TODO :: f_model_is_inside requires the non-GPU-compatible random_number() subroutine which causes build failure. This must be resolved in a future PR. Macro calls are left commented to make returning to this feature easier.
-        ! $:GPU_PARALLEL_LOOP(private='[i,j,k,point]', copy='[ib_markers_sf]', copyin='[patch_id,x_cc,y_cc,model]', collapse=3)
         do i = 0, m
             do j = 0, n
                 do k = 0, p
@@ -955,7 +946,6 @@ contains
                 end do
             end do
         end do
-        ! $:END_GPU_PARALLEL_LOOP()
 
     end subroutine s_ib_model