Replace format labels with strings

src/ADT/adtLocalSearch.F90

@@ -2149,17 +2149,18 @@ subroutine minD2Hexa(xP,x1,x2,x3,x4,x5,x6,x7,x8,d2,chi,iErr)
 
     ! Print some stuff out to the screen for debugging purposes
 
-    !write(*,*)
-    !write(*,*) 'Results of minD2Hexa'
-    !write(*,20)'Point P                = (',xP(1),xP(2),xP(3),' )'
-    !write(*,20)'Found point            = (',x0,y0,z0,' )'
-    !write(*,20)'Parametric coordinates = (',chi(1),chi(2),chi(3),' )'
-    !write(*,30)'Minimum distance       =',sqrt(d2)
-    !write(*,10)'Number of iterations   =',itCount
-
-10  format(a,1x,i3)
-20  format(a,3f10.6,a)
-30  format(a,f20.17,a)
+    ! write(*,*)
+    ! write(*,*) 'Results of minD2Hexa'
+    ! write(*, coordinateFormat)'Point P                = (',xP(1),xP(2),xP(3),' )'
+    ! write(*, coordinateFormat)'Found point            = (',x0,y0,z0,' )'
+    ! write(*, coordinateFormat)'Parametric coordinates = (',chi(1),chi(2),chi(3),' )'
+    ! write(*, distanceFormat)'Minimum distance       =',sqrt(d2)
+    ! write(*, iterationFormat)'Number of iterations   =',itCount
+
+    ! character(len=maxStringLen) :: iterationFormat = '(A, 1x, i3)'
+    ! character(len=maxStringLen) :: coordinateFormat = '(A, 3f10.6, A)'
+    ! character(len=maxStringLen) :: distanceFormat = '(A, f20.17, A)'
+
     return
 
   end subroutine minD2Hexa

src/adjoint/adjointAPI.F90

@@ -1,13 +1,18 @@
 module adjointAPI
 
+  use constants, only: realType, intType, alwaysRealType, adflow_real, mpi_max, mpi_sum, mpi_double_precision, &
+   mpi_integer, mpi_double_complex, mpi_wtime, maxStringLen, one, zero, NSEquations, RANSEquations
+
+  character(len=maxStringLen) :: timeFormat = "(A, 1X, F8.2)"
+  character(len=maxStringLen) :: exitFormat = "(1X, A, 1X, I5, 1X, A)"
+
 contains
 #ifndef USE_COMPLEX
   subroutine computeMatrixFreeProductFwd(xvdot, extradot, wdot, bcDataValuesdot, useSpatial, &
        useState, famLists, bcDataNames, bcDataValues, bcDataFamLists, bcVarsEmpty, dwdot, funcsDot, fDot, &
        costSize, fSize, nTime)
 
     ! This is the main matrix-free forward mode computation
-    use constants
     use adjointvars
     use blockPointers, only : nDom
     use communication, only : adflow_comm_world
@@ -91,7 +96,6 @@ end subroutine computeMatrixFreeProductFwd
   subroutine computeMatrixFreeProductBwd(dwbar, funcsBar, fbar, useSpatial, useState, xvbar, &
        extrabar, wbar, spatialSize, extraSize, stateSize, famLists, &
        bcDataNames, bcDataValues, bcDataValuesbar, bcDataFamLists, BCVarsEmpty)
-    use constants
     use communication, only : adflow_comm_world
     use blockPointers, only : nDom, dwd, il, jl, kl
     use inputTimeSpectral, only : nTimeIntervalsSpectral
@@ -180,7 +184,6 @@ subroutine computeMatrixFreeProductBwdFast(dwbar, wbar, stateSize)
     ! mode computation. It is intended to compute dRdw^T product
     ! ONLY. The main purpose is for fast matrix-vector products for the
     ! actual adjoint solve.
-    use constants
     use inputPhysics, only : equations
     use inputAdjoint, only : frozenTurbulence
     use flowVarRefState, only : nw, nwf
@@ -267,7 +270,6 @@ subroutine solveAdjointForRHS(inVec, outVec, nDOF, relativeTolerance)
     use inputADjoint
     use adjointvars
     use killsignals
-    use constants
     use blockPointers
     use inputTimeSpectral
     use utils, only : EChk
@@ -351,7 +353,6 @@ subroutine solveDirectForRHS(inVec, outVec, nDOF, relativeTolerance)
     use ADJointPETSc
     use inputADjoint
     use adjointVars
-    use constants
     use killsignals
     use blockPointers
     use inputTimeSpectral
@@ -431,7 +432,6 @@ end subroutine solveDirectForRHS
 
   subroutine saveADjointMatrix(fileName)
 
-    use constants
     use ADjointPETSc, only: drdwt
     use communication, only : adflow_comm_world
     use utils, only : EChk
@@ -459,7 +459,6 @@ end subroutine saveADjointMatrix
 
   subroutine saveAdjointPC(fileName)
 
-    use constants
     use ADjointPETSc, only: drdwpret
     use communication, only : adflow_comm_world
     use utils, only : EChk
@@ -487,7 +486,6 @@ end subroutine saveAdjointPC
 
   subroutine saveAdjointRHS(RHS, fileName, nstate)
 
-    use constants
     use ADjointPETSc, only: psi_like1
     use communication, only : adflow_comm_world
     use utils, only : EChk
@@ -525,7 +523,6 @@ end subroutine saveAdjointRHS
 
   subroutine spectralPrecscribedMotion(input, nin, dXv, nout)
 
-    use constants
     use blockPointers, only : il, jl, kl, nDom
     use section, only : sections, nSections
     use inputTimeSpectral, only : nTimeIntervalsSpectral
@@ -625,7 +622,6 @@ end subroutine spectralPrecscribedMotion
 
   subroutine setupAllResidualMatricesfwd
 
-    use constants
     use ADjointPETSc, only : dRdwT
     use communication, only : adflow_comm_world, myid
     use inputADjoint, only : frozenTurbulence, useMatrixFreedRdw
@@ -647,7 +643,7 @@ subroutine setupAllResidualMatricesfwd
 
     if (.not. useMatrixFreedRdw) then
        if( myid ==0 ) then
-          write(*, 10) "Assembling State Residual Matrix in Forward mode..."
+          write(*, "(A)") "Assembling State Residual Matrix in Forward mode..."
        end if
        time(1) = mpi_wtime()
        call setupStateResidualMatrix(drdwT, useAD, usePC, useTranspose, &
@@ -660,14 +656,10 @@ subroutine setupAllResidualMatricesfwd
        call EChk(ierr,  __FILE__, __LINE__)
 
        if(myid ==0)  then
-          write(*, 20) "Assembling State Residaul Matrices Fwd time (s) = ", timeAdj
+          write(*, timeFormat) "Assembling State Residaul Matrices Fwd time (s) = ", timeAdj
        end if
     end if
 
-    ! Output formats.
-10  format(a)
-20  format(a, 1x, f8.2)
-
   end subroutine setupAllResidualMatricesfwd
 
   subroutine solveAdjoint(RHS, psi, checkSolution, nState)
@@ -678,8 +670,6 @@ subroutine solveAdjoint(RHS, psi, checkSolution, nState)
     !      are significant as they are used as the inital guess.
     !
 
-    use constants, only : realType, intType, alwaysRealType, one, adflow_real, &
-         mpi_max, mpi_sum, mpi_double_precision, mpi_integer, mpi_double_complex
     use ADjointPETSc, only : dRdwT, psi_like1, psi_like2, adjointKSP, &
          adjResInit, adjResStart, adjResFinal
 
@@ -715,7 +705,7 @@ subroutine solveAdjoint(RHS, psi, checkSolution, nState)
     ! Send some feedback to screen.
 
     if(myid ==0 .and. printTiming)  &
-         write(*,10) "Solving ADjoint Transpose with PETSc..."
+         write(*, "(A)") "Solving ADjoint Transpose with PETSc..."
 
     call cpu_time(time(1))
 
@@ -834,15 +824,13 @@ subroutine solveAdjoint(RHS, psi, checkSolution, nState)
        ! the norm of error and the number of iterations
 
        if( myid ==0 .and. printTiming) then
-          write(*,20) "Solving ADjoint Transpose with PETSc time (s) =", timeAdj
-          write(*,30) "Norm of error =",norm,"Iterations =",adjConvIts
+          write(*, timeFormat) "Solving ADjoint Transpose with PETSc time (s) =", timeAdj
+          write(*, "(1X, A, 1X, ES10.4, 4X, A, 1X, I4)") "Norm of error =",norm,"Iterations =",adjConvIts
           write(*,*) "------------------------------------------------"
           if( adjConvIts.lt.0 ) then
-             write(*,40) "PETSc solver diverged after", -adjConvIts, &
-                  "iterations..."
+             write(*, exitFormat) "PETSc solver diverged after", -adjConvIts, "iterations..."
           else
-             write(*,40) "PETSc solver converged after", adjConvIts, &
-                  "iterations."
+            write(*, exitFormat) "PETSc solver converged after", adjConvIts, "iterations."
           endif
           write(*,*) "------------------------------------------------"
        endif
@@ -874,13 +862,6 @@ subroutine solveAdjoint(RHS, psi, checkSolution, nState)
        adjointFailed = .True.
     end if
 
-    ! Output formats.
-
-10  format(a)
-20  format(a,1x,f8.2)
-30  format(1x,a,1x,es10.4,4x,a,1x,i4)
-40  format(1x,a,1x,i5,1x,a)
-
 #endif
 
   end subroutine solveAdjoint
@@ -1031,7 +1012,6 @@ subroutine dRdwTMatMult(A, vecX,  vecY, ierr)
     ! dRdwT with a vector. Here we just call the much more broadly
     ! useful routine computeMatrixFreeProductBwdFast()
 
-    use constants
     use communication
     use blockPointers
     use iteration
@@ -1076,7 +1056,6 @@ subroutine dRdwMatMult(A, vecX,  vecY, ierr)
     ! dRdw with a vector. Here we just call the much more broadly
     ! useful routine computeMatrixFreeProductFwd()
 
-    use constants
     use communication
     use blockPointers
     use iteration
@@ -1155,7 +1134,6 @@ subroutine createPETScVars
     !
     !      Create the matrices/vectors that are required for the adjoint
     !
-    use constants
     use ADjointPETSc, only: dRdwT, dRdwPreT, &
          adjointKSP, matfreectx, x_like, psi_like1, adjointPETScVarsAllocated
     use ADjointVars

src/adjoint/adjointUtils.F90

@@ -1344,15 +1344,11 @@ subroutine MyKSPMonitor(myKsp, n, rnorm, dummy, ierr)
     ! Write the residual norm to stdout every adjMonStep iterations.
 
     if(mod(n, adjMonStep) ==0 ) then
-       if( myid==0 ) write(*, 10) n, rnorm
+       if( myid==0 ) write(*, "(I4, 1X, A, 1X, ES16.10)") n, 'KSP Residual norm', rnorm
     end if
 
     ierr = 0
 
-    ! Output format.
-
-10  format(i4, 1x, 'KSP Residual norm', 1x, es16.10)
-
   end subroutine MyKSPMonitor
 
   subroutine setupStandardKSP(kspObject, kspObjectType, gmresRestart, preConSide, &