Skip to content

Commit

Permalink
Fixed print format.
Browse files Browse the repository at this point in the history
  • Loading branch information
@gha3mi
gha3mi committed Dec 11, 2023
1 parent f29a8be commit 2d105c9
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions src/forsolver.f90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ end function dFun
if (this%verbosity == 1) then
print '(a)', '-----------------------------------------------'
print '(a)', 'maxit x0 tol'
print '(i5, 10x, f12.8, 10x, e12.4)', this%maxit, x0, this%TolFun
print '(g0, 10x, f12.8, 10x, e12.4)', this%maxit, x0, this%TolFun
print '(a)', '-----------------------------------------------'
print '(a)', 'start newton'
print '(a)', '-----------------------------------------------'
Expand Down Expand Up @@ -295,7 +295,7 @@ end function dFun
if (this%verbosity == 1) then
print '(a)', '-----------------------------------------------'
print '(a)', 'maxit tol'
print '(i5, 10x, e12.4)', this%maxit, this%TolFun
print '(g0, 10x, e12.4)', this%maxit, this%TolFun
print '(a)', '-----------------------------------------------'
print '(a)', 'start newton'
print '(a)', '-----------------------------------------------'
Expand Down Expand Up @@ -350,7 +350,7 @@ end function Fun
if (this%verbosity == 1) then
print '(a)', '-----------------------------------------------'
print '(a)', 'maxit x0 tol'
print '(i5, 10x, f12.8, 10x, e12.4)', this%maxit, real(x0, kind=rk), this%TolFun
print '(g0, 10x, f12.8, 10x, e12.4)', this%maxit, real(x0, kind=rk), this%TolFun
print '(a)', '-----------------------------------------------'
print '(a)', 'start newton'
print '(a)', '-----------------------------------------------'
Expand Down Expand Up @@ -396,7 +396,7 @@ end function Fun
if (this%verbosity == 1) then
print '(a)', '-----------------------------------------------'
print '(a)', 'maxit tol'
print '(i5, 10x, f12.8, e12.4)', this%maxit, this%TolFun
print '(g0, 10x, f12.8, e12.4)', this%maxit, this%TolFun
print '(a)', '-----------------------------------------------'
print '(a)', 'start newton'
print '(a)', '-----------------------------------------------'
Expand Down Expand Up @@ -560,7 +560,7 @@ end function dFun
criteriaFun = abs(F_val)

if (this%verbosity == 1) then
print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
print '(g0, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -621,7 +621,7 @@ end function dFun
criteriaFun = abs(F_val)

if (this%verbosity == 1) then
print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
print '(g0, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -677,7 +677,7 @@ end function Fun
criteriaFun = abs(F_val)

if (this%verbosity == 1) then
print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
print '(g0, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -733,7 +733,7 @@ end function Fun
criteriaFun = abs(F_val)

if (this%verbosity == 1) then
print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
print '(g0, f12.4, 4x, e12.4, 4x, e12.4)', k, xk, F_val, dFdx_val
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -794,7 +794,7 @@ end function dFun
criteriaFun = norm2(F_val)

if (this%verbosity == 1) then
print '(i5, e12.4)', k, criteriaFun
print '(g0, e12.4)', k, criteriaFun
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -855,7 +855,7 @@ end function dFun
criteriaFun = norm2(F_val)

if (this%verbosity == 1) then
print '(i5, e12.4)', k, criteriaFun
print '(g0, e12.4)', k, criteriaFun
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -909,7 +909,7 @@ end function Fun
criteriaFun = norm2(F_val)

if (this%verbosity == 1) then
print '(i5, e12.4)', k, criteriaFun
print '(g0, e12.4)', k, criteriaFun
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -964,7 +964,7 @@ end function Fun
criteriaFun = norm2(F_val)

if (this%verbosity == 1) then
print '(i5, e12.4)', k, criteriaFun
print '(g0, e12.4)', k, criteriaFun
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -1019,7 +1019,7 @@ end function Fun
criteriaFun = abs(F_val)

if (this%verbosity == 1) then
print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
print '(g0, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -1073,7 +1073,7 @@ end function Fun
criteriaFun = abs(F_val)

if (this%verbosity == 1) then
print '(i5, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
print '(g0, f12.4, 4x, e12.4, 4x, e12.4)', k, real(xk, kind=rk), real(F_val, kind=rk), dFdx_val
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -1127,7 +1127,7 @@ end function Fun
criteriaFun = norm2(real(F_val, kind=rk))

if (this%verbosity == 1) then
print '(i5, e12.4)', k, criteriaFun
print '(g0, e12.4)', k, criteriaFun
end if

if (criteriaFun <= this%TolFun) then
Expand Down Expand Up @@ -1181,7 +1181,7 @@ end function Fun
criteriaFun = norm2(real(F_val, kind=rk))

if (this%verbosity == 1) then
print '(i5, e12.4)', k, criteriaFun
print '(g0, e12.4)', k, criteriaFun
end if

if (criteriaFun <= this%TolFun) then
Expand Down

0 comments on commit 2d105c9

Please sign in to comment.