format and fix test suite

Author: wilfonba

src/common/m_boundary_common.fpp

@@ -1626,7 +1626,7 @@ contains
 
     impure subroutine s_create_mpi_types(bc_type)
 
-        type(integer_field), dimension(1:num_dims, -1:1) :: bc_type
+        type(integer_field), dimension(1:num_dims, -1:1), intent(in) :: bc_type
 
 #ifdef MFC_MPI
         integer :: dir, loc
@@ -1659,9 +1659,9 @@ contains
 
     subroutine s_write_serial_boundary_condition_files(q_prim_vf, bc_type, step_dirpath, old_grid_in)
 
-        type(scalar_field), dimension(sys_size) :: q_prim_vf
-        type(integer_field), dimension(1:num_dims, -1:1) :: bc_type
-        logical :: old_grid_in
+        type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf
+        type(integer_field), dimension(1:num_dims, -1:1), intent(in) :: bc_type
+        logical, intent(in) :: old_grid_in
 
         character(LEN=*), intent(in) :: step_dirpath
 
@@ -1700,8 +1700,8 @@ contains
 
     subroutine s_write_parallel_boundary_condition_files(q_prim_vf, bc_type)
 
-        type(scalar_field), dimension(sys_size) :: q_prim_vf
-        type(integer_field), dimension(1:num_dims, -1:1) :: bc_type
+        type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf
+        type(integer_field), dimension(1:num_dims, -1:1), intent(in) :: bc_type
 
         integer :: dir, loc
         character(len=path_len) :: file_loc, file_path
@@ -1870,7 +1870,7 @@ contains
 
     subroutine s_pack_boundary_condition_buffers(q_prim_vf)
 
-        type(scalar_field), dimension(sys_size) :: q_prim_vf
+        type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf
         integer :: i, j, k
 
         do k = 0, p

src/common/m_helper.fpp

@@ -635,32 +635,32 @@ contains
         integer :: ix, iy, iz, x_id, y_id, z_id
         integer, intent(inout) :: m_ds, n_ds, p_ds, m_glb_ds, n_glb_ds, p_glb_ds
 
-        m_ds = INT((m+1)/3) - 1
-        n_ds = INT((n+1)/3) - 1
-        p_ds = INT((p+1)/3) - 1
+        m_ds = int((m + 1)/3) - 1
+        n_ds = int((n + 1)/3) - 1
+        p_ds = int((p + 1)/3) - 1
 
-        m_glb_ds = INT((m_glb+1)/3) - 1
-        n_glb_ds = INT((n_glb+1)/3) - 1
-        p_glb_ds = INT((p_glb+1)/3) - 1
+        m_glb_ds = int((m_glb + 1)/3) - 1
+        n_glb_ds = int((n_glb + 1)/3) - 1
+        p_glb_ds = int((p_glb + 1)/3) - 1
 
         do i = 1, sys_size
             $:GPU_UPDATE(host='[q_cons_vf(i)%sf]')
         end do
 
-        do l = -1, p_ds+1
-            do k = -1, n_ds+1
-                do j = -1, m_ds+1
+        do l = -1, p_ds + 1
+            do k = -1, n_ds + 1
+                do j = -1, m_ds + 1
                     x_id = 3*j + 1
                     y_id = 3*k + 1
                     z_id = 3*l + 1
                     do i = 1, sys_size
-                        q_cons_temp(i)%sf(j,k,l) = 0
+                        q_cons_temp(i)%sf(j, k, l) = 0
 
                         do iz = -1, 1
                             do iy = -1, 1
                                 do ix = -1, 1
-                                    q_cons_temp(i)%sf(j,k,l) = q_cons_temp(i)%sf(j,k,l) &
-                                    + (1._wp / 27._wp)*q_cons_vf(i)%sf(x_id+ix,y_id+iy,z_id+iz)
+                                    q_cons_temp(i)%sf(j, k, l) = q_cons_temp(i)%sf(j, k, l) &
+                                                                 + (1._wp/27._wp)*q_cons_vf(i)%sf(x_id + ix, y_id + iy, z_id + iz)
                                 end do
                             end do
                         end do

src/common/m_helper_basic.fpp

@@ -124,11 +124,7 @@ contains
         ! the physical computational domain from one time-step iteration to
         ! the next one
         if (igr) then
-            if (viscous) then
-                buff_size = (igr_order - 1) / 2 + 2
-            else
-                buff_size = (igr_order - 1) / 2 + 1
-            end if
+            buff_size = (igr_order - 1)/2 + 2
         else
             if (viscous) then
                 buff_size = 2*weno_polyn + 2

src/common/m_mpi_common.fpp

@@ -300,9 +300,9 @@ contains
         sf_start_idx = (/0, 0, 0/)
 
 #ifndef MFC_POST_PROCESS
-        m_ds = INT((m+1)/3) - 1
-        n_ds = INT((n+1)/3) - 1
-        p_ds = INT((p+1)/3) - 1
+        m_ds = int((m + 1)/3) - 1
+        n_ds = int((n + 1)/3) - 1
+        p_ds = int((p + 1)/3) - 1
 #else
         m_ds = m
         n_ds = n
@@ -311,7 +311,7 @@ contains
 
 #ifdef MFC_POST_PROCESS
         do i = 1, sys_size
-            MPI_IO_DATA%var(i)%sf => q_cons_vf(i)%sf(-1:m_ds+1, -1:n_ds+1, -1:p_ds+1)
+            MPI_IO_DATA%var(i)%sf => q_cons_vf(i)%sf(-1:m_ds + 1, -1:n_ds + 1, -1:p_ds + 1)
         end do
 #endif
         ! Define global(g) and local(l) sizes for flow variables

src/post_process/m_data_input.f90

@@ -355,7 +355,7 @@ impure subroutine s_read_parallel_data_files(t_step)
         allocate (y_cb_glb(-1:n_glb))
         allocate (z_cb_glb(-1:p_glb))
 
-        if(down_sample) then
+        if (down_sample) then
             delx = (x_domain%end - x_domain%beg)/real(m_glb + 1, wp)
             do i = 0, m_glb
                 x_cb_glb(i - 1) = x_domain%beg + delx*real(i, wp)
@@ -384,7 +384,7 @@ impure subroutine s_read_parallel_data_files(t_step)
         x_cc(0:m) = x_cb(-1:m - 1) + dx(0:m)/2._wp
 
         if (n > 0) then
-            if(down_sample) then
+            if (down_sample) then
                 dely = (y_domain%end - y_domain%beg)/real(n_glb + 1, wp)
                 do i = 0, n_glb
                     y_cb_glb(i - 1) = y_domain%beg + dely*real(i, wp)
@@ -413,7 +413,7 @@ impure subroutine s_read_parallel_data_files(t_step)
             y_cc(0:n) = y_cb(-1:n - 1) + dy(0:n)/2._wp
 
             if (p > 0) then
-                if(down_sample) then
+                if (down_sample) then
                     delz = (z_domain%end - z_domain%beg)/real(p_glb + 1, wp)
                     do i = 0, p_glb
                         z_cb_glb(i - 1) = z_domain%beg + delz*real(i, wp)
@@ -486,7 +486,7 @@ impure subroutine s_read_parallel_conservative_data(t_step, m_MOK, n_MOK, p_MOK,
             if (file_exist) then
                 call MPI_FILE_OPEN(MPI_COMM_SELF, file_loc, MPI_MODE_RDONLY, mpi_info_int, ifile, ierr)
 
-                if(down_sample) then
+                if (down_sample) then
                     call s_initialize_mpi_data_ds(q_cons_temp)
                 else
                     ! Initialize MPI data I/O
@@ -497,7 +497,7 @@ impure subroutine s_read_parallel_conservative_data(t_step, m_MOK, n_MOK, p_MOK,
                     end if
                 end if
 
-                if(down_sample) then
+                if (down_sample) then
                     ! Size of local arrays
                     data_size = (m + 3)*(n + 3)*(p + 3)
 
@@ -541,9 +541,9 @@ impure subroutine s_read_parallel_conservative_data(t_step, m_MOK, n_MOK, p_MOK,
                 call s_mpi_barrier()
                 call MPI_FILE_CLOSE(ifile, ierr)
 
-                if(down_sample) then
+                if (down_sample) then
                     do i = 1, sys_size
-                        q_cons_vf(i)%sf(0:m,0:n,0:p) = q_cons_temp(i)%sf(0:m,0:n,0:p)
+                        q_cons_vf(i)%sf(0:m, 0:n, 0:p) = q_cons_temp(i)%sf(0:m, 0:n, 0:p)
                     end do
                 end if
 
@@ -608,9 +608,9 @@ impure subroutine s_initialize_data_input_module
             ! Simulation is 3D
             if (p > 0) then
                 call s_allocate_field_arrays(-buff_size, m + buff_size, n + buff_size, p + buff_size)
-                if(down_sample) then
+                if (down_sample) then
                     do i = 1, sys_size
-                        allocate(q_cons_temp(i)%sf(-1:m+1,-1:n+1,-1:p+1))
+                        allocate (q_cons_temp(i)%sf(-1:m + 1, -1:n + 1, -1:p + 1))
                     end do
                 end if
             else

src/post_process/m_global_parameters.fpp

@@ -153,9 +153,8 @@ module m_global_parameters
     ! Stands for "InDices With BUFFer".
     type(int_bounds_info) :: idwbuff(1:3)
 
-
     !! Locations of the domain bounds in the x-, y- and z-coordinate directions
-    type(bounds_info) :: x_domain, y_domain, z_domain 
+    type(bounds_info) :: x_domain, y_domain, z_domain
 
     integer :: num_bc_patches
     logical :: bc_io
@@ -802,8 +801,8 @@ contains
         allocate (MPI_IO_DATA%view(1:sys_size))
         allocate (MPI_IO_DATA%var(1:sys_size))
         do i = 1, sys_size
-            if(down_sample) then
-                allocate (MPI_IO_DATA%var(i)%sf(-1:m+1, -1:n+1, -1:p+1))
+            if (down_sample) then
+                allocate (MPI_IO_DATA%var(i)%sf(-1:m + 1, -1:n + 1, -1:p + 1))
             else
                 allocate (MPI_IO_DATA%var(i)%sf(0:m, 0:n, 0:p))
             end if

src/post_process/m_start_up.f90

@@ -115,10 +115,10 @@ impure subroutine s_read_input_file
 
             call s_update_cell_bounds(cells_bounds, m, n, p)
 
-            if(down_sample) then
-                m = INT((m+1)/3) - 1
-                n = INT((n+1)/3) - 1
-                p = INT((p+1)/3) - 1
+            if (down_sample) then
+                m = int((m + 1)/3) - 1
+                n = int((n + 1)/3) - 1
+                p = int((p + 1)/3) - 1
             end if
 
             ! Store m,n,p into global m,n,p

src/pre_process/m_compute_levelset.fpp

@@ -27,10 +27,10 @@ module m_compute_levelset
 
 contains
 
-    pure subroutine s_circle_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_circle_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
         integer, intent(IN) :: ib_patch_id
 
         real(wp) :: radius, dist
@@ -63,10 +63,10 @@ contains
 
     end subroutine s_circle_levelset
 
-    pure subroutine s_airfoil_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_airfoil_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
         integer, intent(IN) :: ib_patch_id
 
         real(wp) :: dist, global_dist
@@ -146,10 +146,10 @@ contains
 
     end subroutine s_airfoil_levelset
 
-    pure subroutine s_3D_airfoil_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_3D_airfoil_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
         integer, intent(IN) :: ib_patch_id
 
         real(wp) :: dist, dist_surf, dist_side, global_dist
@@ -250,10 +250,10 @@ contains
     end subroutine s_3D_airfoil_levelset
 
     !>  Initialize IBM module
-    pure subroutine s_rectangle_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_rectangle_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
 
         integer, intent(in) :: ib_patch_id
         real(wp) :: top_right(2), bottom_left(2)
@@ -347,10 +347,10 @@ contains
 
     end subroutine s_rectangle_levelset
 
-    pure subroutine s_cuboid_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_cuboid_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
 
         integer, intent(IN) :: ib_patch_id
         real(wp) :: Right, Left, Bottom, Top, Front, Back
@@ -464,10 +464,10 @@ contains
 
     end subroutine s_cuboid_levelset
 
-    pure subroutine s_sphere_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_sphere_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
         integer, intent(IN) :: ib_patch_id
 
         real(wp) :: radius, dist
@@ -501,10 +501,10 @@ contains
 
     end subroutine s_sphere_levelset
 
-    pure subroutine s_cylinder_levelset(levelset, levelset_norm, ib_patch_id)
+    pure subroutine s_cylinder_levelset(ib_patch_id, levelset, levelset_norm)
 
-        type(levelset_field), intent(INOUT) :: levelset
-        type(levelset_norm_field), intent(INOUT) :: levelset_norm
+        type(levelset_field), intent(INOUT), optional :: levelset
+        type(levelset_norm_field), intent(INOUT), optional :: levelset_norm
         integer, intent(IN) :: ib_patch_id
 
         real(wp) :: radius