Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure "fortran_std=f2008" #77

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure "fortran_std=f2008" #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/example_hybrd1.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ program example_hybrd1
integer,parameter :: n = 9
integer,parameter :: lwa = (n*(3*n+13))/2

integer :: j, info
integer :: info
real(wp) :: tol, fnorm
real(wp) :: x(n), fvec(n), wa(lwa)

Expand Down
1 change: 1 addition & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ project(
default_options: [
'default_library=both',
'buildtype=debugoptimized',
'fortran_std=f2008',
],
)
if get_option('api')
Expand Down
2 changes: 1 addition & 1 deletion test/test_chkder.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ end function dfloat
!>
! Get expected `diff` vectors for each case.

pure function solution(nprob) result(x)
function solution(nprob) result(x)

implicit none

Expand Down
6 changes: 3 additions & 3 deletions test/test_hybrd.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ end function dfloat
!>
! Get expected `x` vectors for each case.

pure function solution(nprob) result(x)
function solution(nprob) result(x)

implicit none

Expand Down Expand Up @@ -385,7 +385,7 @@ subroutine vecfcn(n, x, Fvec, Nprob)
real(wp), parameter :: c8 = 5.0e-1_wp
real(wp), parameter :: c9 = 2.9e1_wp

integer :: i, iev, ivar, j, k, k1, k2, kp1, ml, mu
integer :: i, iev, j, k, k1, k2, kp1, ml, mu
real(wp) :: h, prod, sum, sum1, sum2, temp, temp1, &
temp2, ti, tj, tk, tpi

Expand Down Expand Up @@ -598,7 +598,7 @@ subroutine initpt(n, x, Nprob, Factor)
!! the standard starting point. if factor is unity, no
!! multiplication is performed.

integer :: ivar, j
integer :: j
real(wp) :: h, tj

real(wp), parameter :: zero = 0.0_wp
Expand Down
2 changes: 1 addition & 1 deletion test/test_hybrj.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ end function dfloat
!>
! Get expected `x` vectors for each case.

pure function solution(nprob) result(x)
function solution(nprob) result(x)

implicit none

Expand Down
10 changes: 5 additions & 5 deletions test/test_lmder.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ program test_lmder
1,1,5,2,5,1,1,1,3,1,3,3,3,2,2,1,1,1,1,4,1,&
1,1,2,1,2,2,2,2,2,1,1] !! original `info` from the original minpack

integer :: i, ic, info, k, ldfjac, lwa, m, n, NFEv, NJEv, NPRob, ntries, icase, iunit
integer :: i, ic, info, k, ldfjac, lwa, m, n, NFEv, NJEv, NPRob, ntries, icase
real(wp) :: factor, fnorm1, fnorm2
integer :: ma(53), na(53), nf(53), nj(53), np(53), nx(53)
real(wp) :: fnm(53)
Expand Down Expand Up @@ -196,7 +196,7 @@ end function dfloat
!>
! Get expected `x` vectors for each case.

pure function solution(nprob) result(x)
function solution(nprob) result(x)

implicit none

Expand Down Expand Up @@ -376,7 +376,7 @@ subroutine ssqjac(m, n, x, Fjac, Ldfjac, Nprob)
real(wp), parameter :: c45 = 45.0_wp
real(wp), parameter :: c100 = 100.0_wp

integer :: i, ivar, j, k, mm1, nm1
integer :: i, j, k, mm1, nm1
real(wp) :: div, dx, prod, s2, temp, ti, tmp1, tmp2, tmp3, tmp4, tpi

Fjac(1:m, 1:n) = zero
Expand Down Expand Up @@ -724,7 +724,7 @@ subroutine initpt(n, x, Nprob, Factor)
real(wp), parameter :: c16 = 4.5_wp
real(wp), parameter :: c17 = 5.5_wp

integer :: ivar, j
integer :: j
real(wp) :: h

x(1:n) = zero
Expand Down Expand Up @@ -931,7 +931,7 @@ subroutine ssqfcn(m, n, x, Fvec, Nprob)
real(wp),parameter :: c29 = 29.0_wp
real(wp),parameter :: c45 = 45.0_wp

integer :: i, iev, ivar, j, nm1
integer :: i, iev, j, nm1
real(wp) :: div, dx, prod, sum, s1, s2, temp, ti, &
tmp1, tmp2, tmp3, tmp4, tpi

Expand Down
6 changes: 3 additions & 3 deletions test/test_lmdif.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ end function dfloat
!>
! Get expected `x` vectors for each case.

pure function solution(nprob) result(x)
function solution(nprob) result(x)

implicit none

Expand Down Expand Up @@ -394,7 +394,7 @@ subroutine ssqfcn(m, n, x, Fvec, Nprob)
7.1e-1_wp, 7.29e-1_wp, 7.2e-1_wp, 6.36e-1_wp, 5.81e-1_wp, 4.28e-1_wp, &
2.92e-1_wp, 1.62e-1_wp, 9.8e-2_wp, 5.4e-2_wp]

integer :: i, iev, ivar, j, nm1
integer :: i, iev, j, nm1
real(wp) :: div, dx, prod, sum, s1, s2, temp, ti, tmp1, tmp2, tmp3, tmp4, tpi

Fvec(1:m) = zero
Expand Down Expand Up @@ -634,7 +634,7 @@ subroutine initpt(n, x, Nprob, Factor)
real(wp),parameter :: c16 = 4.5_wp
real(wp),parameter :: c17 = 5.5_wp

integer :: ivar, j
integer :: j
real(wp) :: h

x(1:n) = zero
Expand Down
8 changes: 4 additions & 4 deletions test/test_lmstr.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ end function dfloat
!>
! Get expected `x` vectors for each case.

pure function solution(nprob) result(x)
function solution(nprob) result(x)

implicit none

Expand Down Expand Up @@ -386,7 +386,7 @@ subroutine ssqjac(m, n, x, Fjac, Ldfjac, Nprob)
real(wp),parameter :: v(11) = [4.0_wp, 2.0_wp, 1.0_wp, 5.0e-1_wp, 2.5e-1_wp, 1.67e-1_wp, &
1.25e-1_wp, 1.0e-1_wp, 8.33e-2_wp, 7.14e-2_wp, 6.25e-2_wp]

integer :: i, ivar, j, k, mm1, nm1
integer :: i, j, k, mm1, nm1
real(wp) :: div, dx, prod, s2, temp, ti, tmp1, tmp2, tmp3, tmp4, tpi

Fjac(1:m, 1:n) = zero
Expand Down Expand Up @@ -680,7 +680,7 @@ subroutine initpt(n, x, Nprob, Factor)
real(wp),parameter :: c16 = 4.5_wp
real(wp),parameter :: c17 = 5.5_wp

integer :: ivar, j
integer :: j
real(wp) :: h

x(1:n) = zero
Expand Down Expand Up @@ -870,7 +870,7 @@ subroutine ssqfcn(m, n, x, Fvec, Nprob)
7.1e-1_wp, 7.29e-1_wp, 7.2e-1_wp, 6.36e-1_wp, 5.81e-1_wp, 4.28e-1_wp, &
2.92e-1_wp, 1.62e-1_wp, 9.8e-2_wp, 5.4e-2_wp]

integer :: i, iev, ivar, j, nm1
integer :: i, iev, j, nm1
real(wp) :: div, dx, prod, sum, s1, s2, temp, &
ti, tmp1, tmp2, tmp3, tmp4, tpi

Expand Down