Removed print statements

Author: Daniel Vickers

src/simulation/m_particle_bed.fpp

@@ -41,24 +41,8 @@ contains
 
         if (num_particle_beds == 0) return
 
-<<<<<<< HEAD
         call cpu_time(t_start)
         n_total_placed = 0
-=======
-        ! Grow patch_ib from the namelist-sized allocation to the full capacity needed for particle beds
-        if (size(patch_ib) < num_ib_patches_max) then
-            block
-                type(ib_patch_parameters), allocatable :: tmp(:)
-                integer                                :: n
-                n = size(patch_ib)
-                allocate (tmp(n))
-                tmp(1:n) = patch_ib(1:n)
-                deallocate (patch_ib)
-                allocate (patch_ib(num_ib_patches_max))
-                patch_ib(1:n) = tmp
-            end block
-        end if
->>>>>>> 2c3099e1155411381d72e866957b6fcf2d89f9fc
 
         do b = 1, num_particle_beds
             xmin = particle_bed(b)%x_centroid - 0.5_wp*particle_bed(b)%length_x

src/simulation/m_start_up.fpp

@@ -927,12 +927,9 @@ contains
                 call s_generate_particle_beds()
             end if
             call s_instantiate_STL_models()
-            if (proc_rank == 0) print *, "s_reduce_ib_patch_array"
             call s_reduce_ib_patch_array()
-            if (proc_rank == 0) print *, "s_ibm_setup"
             call s_ibm_setup()
             if (t_step_start == 0 .or. (cfl_dt .and. n_start == 0)) then
-                if (proc_rank == 0) print *, "s_write_ib_data_file"
                 call s_write_ib_data_file(0)
                 call s_write_ib_state_file(0)
             end if