More case file changes

Author: danieljvickers

examples/2D_ibm_ellipse/case.py

@@ -81,11 +81,7 @@
             "patch_icpp(1)%pres": 1.0e00,
             "patch_icpp(1)%alpha_rho(1)": 1.0e00,
             "patch_icpp(1)%alpha(1)": 1.0e00,
-<<<<<<< HEAD
-            # Patch: Cylinder Immersed Boundary
-=======
             # Patch: Ellipse Immersed Boundary
->>>>>>> master
             "patch_ib(1)%geometry": 6,
             "patch_ib(1)%x_centroid": 1.5e-03,
             "patch_ib(1)%y_centroid": 3.0e-03,

src/simulation/m_ibm.fpp

@@ -109,19 +109,15 @@ contains
 
         ! recompute the new ib_patch locations and broadcast them.
         call s_apply_ib_patches(ib_markers%sf(0:m, 0:n, 0:p), levelset, levelset_norm)
-        call s_populate_ib_buffers() ! transmits the new IB markers via MPI
-
-        ! Allocating the patch identities bookkeeping variable
-        allocate (patch_id_fp(0:m, 0:n, 0:p))
+        ! Get neighboring IB variables from other processors
+        call s_populate_ib_buffers()
 
         $:GPU_UPDATE(device='[ib_markers%sf]')
         $:GPU_UPDATE(device='[levelset%sf]')
         $:GPU_UPDATE(device='[levelset_norm%sf]')
 
-        ! Get neighboring IB variables from other processors
-        call s_populate_ib_buffers()
-
-        $:GPU_UPDATE(host='[ib_markers%sf]')
+        ! Allocating the patch identities bookkeeping variable
+        allocate (patch_id_fp(0:m, 0:n, 0:p))
 
         ! 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)