Common Directory, Formatting and Added Intent (#476)

Author: okBrian

src/common/include/inline_conversions.fpp

@@ -5,12 +5,12 @@
 #else
         !$acc routine seq
 #endif
-        real(kind(0d0)), intent(IN) :: pres
-        real(kind(0d0)), intent(IN) :: rho, gamma, pi_inf
-        real(kind(0d0)), intent(IN) :: H
-        real(kind(0d0)), dimension(num_fluids), intent(IN) :: adv
-        real(kind(0d0)), intent(IN) :: vel_sum
-        real(kind(0d0)), intent(OUT) :: c
+        real(kind(0d0)), intent(in) :: pres
+        real(kind(0d0)), intent(in) :: rho, gamma, pi_inf
+        real(kind(0d0)), intent(in) :: H
+        real(kind(0d0)), dimension(num_fluids), intent(in) :: adv
+        real(kind(0d0)), intent(in) :: vel_sum
+        real(kind(0d0)), intent(out) :: c
 
         real(kind(0d0)) :: blkmod1, blkmod2
 

src/common/m_compile_specific.f90

@@ -16,7 +16,7 @@ module m_compile_specific
     !>  Creates a directory and all its parents if it does not exist
         !!  @param dir_name Directory path
     subroutine s_create_directory(dir_name)
-        character(LEN=*), intent(IN) :: dir_name
+        character(LEN=*), intent(in) :: dir_name
 
 #ifdef _WIN32
         call system('mkdir "'//dir_name//'" 2> NUL')
@@ -27,7 +27,7 @@ subroutine s_create_directory(dir_name)
     end subroutine s_create_directory
 
     subroutine s_delete_file(filepath)
-        character(LEN=*), intent(IN) :: filepath
+        character(LEN=*), intent(in) :: filepath
 
 #ifdef _WIN32
         call system('del "'//filepath//'"')
@@ -38,7 +38,7 @@ subroutine s_delete_file(filepath)
     end subroutine s_delete_file
 
     subroutine s_delete_directory(dir_name)
-        character(LEN=*), intent(IN) :: dir_name
+        character(LEN=*), intent(in) :: dir_name
 
 #ifdef _WIN32
         call system('rmdir "'//dir_name//'" /s /q')
@@ -52,8 +52,8 @@ end subroutine s_delete_directory
         !!  @param fileloc File directory location
         !!  @param dircheck Switch that indicates if directory exists
     subroutine my_inquire(fileloc, dircheck)
-        character(LEN=*), intent(IN) :: fileloc
-        logical, intent(INOUT) :: dircheck
+        character(LEN=*), intent(in) :: fileloc
+        logical, intent(inout) :: dircheck
 
 #ifdef __INTEL_COMPILER
         inquire (DIRECTORY=trim(fileloc), EXIST=dircheck)   !Intel
@@ -64,14 +64,14 @@ subroutine my_inquire(fileloc, dircheck)
     end subroutine my_inquire
 
     subroutine s_get_cwd(cwd)
-        character(LEN=*), intent(OUT) :: cwd
+        character(LEN=*), intent(out) :: cwd
 
         call GETCWD(cwd)
     end subroutine s_get_cwd
 
     subroutine s_get_basename(dirpath, basename)
-        character(LEN=*), intent(IN) :: dirpath
-        character(LEN=*), intent(OUT) :: basename
+        character(LEN=*), intent(in) :: dirpath
+        character(LEN=*), intent(out) :: basename
 
         integer :: iUnit
         character(len=30) :: tmpfilepath

src/common/m_delay_file_access.f90

@@ -2,8 +2,7 @@ module m_delay_file_access
     implicit none
     private
 
-    public :: &
-        DelayFileAccess
+    public :: DelayFileAccess
 
     integer, private, parameter :: &
         N_PROCESSES_FILE_ACCESS = 128, &
@@ -12,16 +11,10 @@ module m_delay_file_access
 contains
 
     subroutine DelayFileAccess(ProcessRank)
+        integer, intent(in) :: ProcessRank
 
-        integer, intent(in) :: &
-            ProcessRank
-
-        integer :: &
-            iDelay, &
-            nFileAccessDelayIterations
-        real(kind(0d0)) :: &
-            Number, &
-            Dummy
+        integer :: iDelay, nFileAccessDelayIterations
+        real(kind(0d0)) :: Number, Dummy
 
         nFileAccessDelayIterations &
             = (ProcessRank/N_PROCESSES_FILE_ACCESS)*FILE_ACCESS_DELAY_UNIT

src/common/m_eigen_solver.f90

@@ -10,7 +10,8 @@ module m_eigen_solver
 
     implicit none
 
-    private; public :: cg, cbal, corth, comqr2, csroot, cdiv, pythag
+    private; 
+    public :: cg, cbal, corth, comqr2, csroot, cdiv, pythag
 
 contains
 
@@ -51,9 +52,14 @@ subroutine cg(nm, nl, ar, ai, wr, wi, zr, zi, fv1, fv2, fv3, ierr)
 !     this version dated august 1983.
 !
 !     ------------------------------------------------------------------
-        integer nm, nl, is1, is2, ierr
-        real(kind(0d0)), dimension(nm, nl) :: ar, ai, zr, zi
-        real(kind(0d0)), dimension(nl) :: wr, wi, fv1, fv2, fv3
+        integer, intent(in) :: nm, nl
+        real(kind(0d0)), dimension(nm:nl), intent(inout) :: ar, ai
+        real(kind(0d0)), dimension(nl), intent(out) :: wr, wi
+        real(kind(0d0)), dimension(nm, nl), intent(out) :: zr, zi
+        real(kind(0d0)), dimension(nl), intent(out) :: fv1, fv2, fv3
+        integer, intent(out) :: ierr
+
+        integer :: is1, is2
 
         if (nl <= nm) go to 10
         ierr = 10*nl
@@ -125,11 +131,14 @@ subroutine cbal(nm, nl, ar, ai, low, igh, scale)
 !     this version dated august 1983.
 !
 !     ------------------------------------------------------------------
-        integer i, j, k, l, ml, nl, jj, nm, igh, low, iexc
-        real(kind(0d0)), dimension(nm, nl) :: ar, ai
-        real(kind(0d0)), dimension(nl) :: scale
+        integer, intent(in) :: nm, nl
+        real(kind(0d0)), dimension(nm, nl), intent(inout) :: ar, ai
+        integer, intent(out) :: low, igh
+        real(kind(0d0)), dimension(nl), intent(out) :: scale
+
+        integer :: i, j, k, l, ml, jj, iexc
         real(kind(0d0)) :: c, f, g, r, s, b2, radix
-        logical noconv
+        logical :: noconv
 
         radix = 16.0d0
 
@@ -295,12 +304,13 @@ subroutine corth(nm, nl, low, igh, ar, ai, ortr, orti)
 !     this version dated august 1983.
 !
 !     ------------------------------------------------------------------
-        integer i, j, ml, nl, ii, jj, la, mp, nm, igh, kp1, low
-        real(kind(0d0)), dimension(nm, nl) :: ar, ai
-        real(kind(0d0)), dimension(igh) :: ortr, orti
+        integer, intent(in) :: nm, nl, low, igh
+        real(kind(0d0)), dimension(nm, nl), intent(inout) :: ar, ai
+        real(kind(0d0)), dimension(igh), intent(out) :: ortr, orti
+
+        integer :: i, j, ml, ii, jj, la, mp, kp1, mll
         real(kind(0d0)) :: f, g, h, fi, fr, scale, c
 
-        integer mll
         mll = 6
 
         la = igh - 1
@@ -460,11 +470,14 @@ subroutine comqr2(nm, nl, low, igh, ortr, orti, hr, hi, wr, wi, zr, zi, ierr)
 !     this version dated october 1989.
 !
 !     ------------------------------------------------------------------
-        integer i, j, k, l, ml, nl, en, ii, jj, ll, nm, nn, igh, ip1, &
-            itn, its, low, lp1, enm1, iend, ierr
-        real(kind(0d0)), dimension(nm, nl) :: hr, hi, zr, zi
-        real(kind(0d0)), dimension(nl) :: wr, wi
-        real(kind(0d0)), dimension(igh) :: ortr, orti
+        integer, intent(in) :: nm, nl, low, igh
+        real(kind(0d0)), dimension(nm, nl), intent(inout) :: hr, hi
+        real(kind(0d0)), dimension(nl), intent(out) :: wr, wi
+        real(kind(0d0)), dimension(nm, nl), intent(out) :: zr, zi
+        real(kind(0d0)), dimension(igh), intent(inout) :: ortr, orti
+        integer, intent(out) :: ierr
+
+        integer :: i, j, k, l, ml, en, ii, jj, ll, nn, ip1, itn, its, lp1, enm1, iend
         real(kind(0d0)) :: si, sr, ti, tr, xi, xr, yi, yr, zzi, zzr, &
                            norm, tst1, tst2, c, d
 !
@@ -843,9 +856,13 @@ subroutine cbabk2(nm, nl, low, igh, scale, ml, zr, zi)
 !
 !     ------------------------------------------------------------------
 !
-        integer i, j, k, ml, nl, ii, nm, igh, low
-        double precision scale(nl), zr(nm, ml), zi(nm, ml)
-        double precision s
+        integer, intent(in) :: nm, nl, low, igh
+        double precision, intent(in) :: scale(nl)
+        integer, intent(in) :: ml
+        double precision, intent(inout) :: zr(nm, ml), zi(nm, ml)
+
+        integer :: i, j, k, ii
+        double precision :: s
 
         if (ml == 0) go to 200
         if (igh == low) go to 120
@@ -885,7 +902,8 @@ subroutine cbabk2(nm, nl, low, igh, scale, ml, zr, zi)
     end subroutine cbabk2
 
     subroutine csroot(xr, xi, yr, yi)
-        real(kind(0d0)) :: xr, xi, yr, yi
+        real(kind(0d0)), intent(in) :: xr, xi
+        real(kind(0d0)), intent(out) :: yr, yi
 !
 !     (yr,yi) = complex dsqrt(xr,xi)
 !     branch chosen so that yr .ge. 0.0 and sign(yi) .eq. sign(xi)
@@ -904,7 +922,8 @@ subroutine csroot(xr, xi, yr, yi)
     end subroutine csroot
 
     subroutine cdiv(ar, ai, br, bi, cr, ci)
-        real(kind(0d0)) :: ar, ai, br, bi, cr, ci
+        real(kind(0d0)), intent(in) :: ar, ai, br, bi
+        real(kind(0d0)), intent(out) :: cr, ci
 !
 !     complex division, (cr,ci) = (ar,ai)/(br,bi)
 !
@@ -921,7 +940,8 @@ subroutine cdiv(ar, ai, br, bi, cr, ci)
     end subroutine cdiv
 
     subroutine pythag(a, b, c)
-        real(kind(0d0)) :: a, b, c
+        real(kind(0d0)), intent(in) :: a, b
+        real(kind(0d0)), intent(out) :: c
 !
 !     finds dsqrt(a**2+b**2) without overflow or destructive underflow
 !