Merge branch 'master' into master

Author: sbryngelson

.github/workflows/lint-source.yml

@@ -29,11 +29,14 @@ jobs:
       run: pip install fortitude-lint ansi2txt
 
     - name: Lint the source code
-      run:  fortitude check --file-extensions=f90,fpp,fypp --ignore=E001,S001,S101,M011,F001,S041,T001,S101 ./src/** || true
+      run:  fortitude check --file-extensions=f90,fpp,fypp --ignore=E001,S001,S101,M011,F001,S041,T001,S101,S102,T002,T011 ./src/** || true
 
     - name: Ensure kind is specified
       run:  fortitude check --file-extensions=f90,fpp,fypp --select=P001 ./src/**
 
+    - name: Ensure subroutines are named
+      run:  fortitude check --file-extensions=f90,fpp,fypp --select=S061 ./src/**
+
     - name: No double precision intrinsics
       run: |
         ! grep -iR 'double_precision\|dsqrt\|dexp\|dlog\|dble\|dabs\|double\ precision\|real(8)\|real(4)\|dprod\|dmin\|dmax\|dfloat\|dreal\|dcos\|dsin\|dtan\|dsign\|dtanh\|dsinh\|dcosh\|d0' --exclude-dir=syscheck --exclude="*nvtx*" --exclude="*precision_select*" ./src/*

src/common/m_checker_common.fpp

@@ -130,7 +130,7 @@ contains
         @:PROHIBIT(adv_n .and. (.not. bubbles_euler))
         @:PROHIBIT(adv_n .and. num_fluids /= 1)
         @:PROHIBIT(adv_n .and. qbmm)
-    end subroutine
+    end subroutine s_check_inputs_adv_n
 
     !> Checks constraints on the phase change parameters.
         !! Called by s_check_inputs_common for pre-processing and simulation

src/common/m_helper.fpp

@@ -101,7 +101,7 @@ contains
         end do
         write (*, fmt="(A1)") " "
 
-    end subroutine
+    end subroutine s_print_2D_array
 
     !> Initializes non-polydisperse bubble modeling
     subroutine s_initialize_nonpoly
@@ -248,7 +248,7 @@ contains
 
         write (res, '(I0)') i
         res = trim(res)
-    end subroutine
+    end subroutine s_int_to_str
 
     !> Computes the Simpson weights for quadrature
     subroutine s_simpson

src/common/m_mpi_common.fpp

@@ -234,7 +234,6 @@ contains
 
     subroutine s_mpi_gather_data(my_vector, counts, gathered_vector, root)
 
-        implicit none
         integer, intent(in) :: counts          ! Array of vector lengths for each process
         real(wp), intent(in), dimension(counts) :: my_vector   ! Input vector on each process
         integer, intent(in) :: root               ! Rank of the root process

src/common/m_phase_change.fpp

@@ -794,7 +794,7 @@ contains
 
     !>  This subroutine finalizes the phase change module
     subroutine s_finalize_relaxation_solver_module
-    end subroutine
+    end subroutine s_finalize_relaxation_solver_module
 
 #endif
 

src/post_process/m_data_input.f90

@@ -37,6 +37,8 @@ module m_data_input
         !!  @param t_step Current time-step to input
         subroutine s_read_abstract_data_files(t_step)
 
+            implicit none
+
             integer, intent(in) :: t_step
 
         end subroutine s_read_abstract_data_files

src/pre_process/include/2dHardcodedIC.fpp

@@ -100,8 +100,8 @@
         end if
 
     case (205) ! 2D lung wave interaction problem
-        h = 0._wp           !non dim origin y
-        lam = 1._wp         !non dim lambda
+        h = 0.0_wp           !non dim origin y
+        lam = 1.0_wp         !non dim lambda
         amp = patch_icpp(patch_id)%a(2)         !to be changed later!       !non dim amplitude
 
         intH = amp*sin(2*pi*x_cc(i)/lam - pi/2) + h
@@ -115,8 +115,8 @@
         end if
 
     case (206) ! 2D lung wave interaction problem - horizontal domain
-        h = 0._wp           !non dim origin y
-        lam = 1._wp         !non dim lambda
+        h = 0.0_wp           !non dim origin y
+        lam = 1.0_wp         !non dim lambda
         amp = patch_icpp(patch_id)%a(2)
 
         intL = amp*sin(2*pi*y_cc(j)/lam - pi/2) + h

src/pre_process/m_assign_variables.fpp

@@ -684,4 +684,4 @@ contains
 
     end subroutine s_finalize_assign_variables_module
 
-end module
+end module m_assign_variables

src/pre_process/m_compute_levelset.fpp

@@ -261,7 +261,7 @@ contains
         type(levelset_field), intent(INOUT) :: levelset
         type(levelset_norm_field), intent(INOUT) :: levelset_norm
 
-        integer :: ib_patch_id
+        integer, intent(in) :: ib_patch_id
         real(wp) :: top_right(2), bottom_left(2)
         real(wp) :: x, y, min_dist
         real(wp) :: side_dists(4)

src/pre_process/m_grid.f90

@@ -37,8 +37,6 @@ module m_grid
 
         subroutine s_generate_abstract_grid
 
-            ! integer, intent(IN), optional :: dummy
-
         end subroutine s_generate_abstract_grid
 
     end interface