From 2693b57921e37e1d5624ff174386edc088009a51 Mon Sep 17 00:00:00 2001 From: Hanno Hildenbrandt Date: Mon, 13 May 2024 17:09:03 +0200 Subject: [PATCH 1/2] -std=f2018 --- src/DAISIE_loglik_rhs_FORTRAN.f95 | 22 +++++++++++----------- src/Makevars | 1 + 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/DAISIE_loglik_rhs_FORTRAN.f95 b/src/DAISIE_loglik_rhs_FORTRAN.f95 index e7ffdc93..cf62b00c 100644 --- a/src/DAISIE_loglik_rhs_FORTRAN.f95 +++ b/src/DAISIE_loglik_rhs_FORTRAN.f95 @@ -56,7 +56,7 @@ SUBROUTINE daisie_initmod (steadyparms) INTEGER, PARAMETER :: nparsmall = 2 ! constant-length parameters DOUBLE PRECISION parms(nparsmall) - COMMON /XCBPar/parms ! common block + !COMMON /XCBPar/parms ! common block ! Set the fixed parameters obtained from R CALL steadyparms(nparsmall, parms) @@ -89,7 +89,7 @@ SUBROUTINE daisie_runmod (neq, t, Conc, dConc, yout, ip) INTEGER :: neq, ip(*), i, ii DOUBLE PRECISION :: t, Conc(2 * N + 1), dConc(2 * N + 1), yout(*) DOUBLE PRECISION :: xx1(N + 3), xx2(N + 3), xx3 - INTEGER :: il1(N), il2(N), il3in3(N), il4(N) + INTEGER :: il1(N), il2(N), il3in3(N), il4(N) INTEGER :: in1(N), in2ix2(N) INTEGER :: ix1(N), ix3(N), ix4(N) DOUBLE PRECISION :: laavec(N + 4 + 2 * kk),lacvec(N + 4 + 2 * kk) @@ -97,11 +97,11 @@ SUBROUTINE daisie_runmod (neq, t, Conc, dConc, yout, ip) DOUBLE PRECISION :: nn(N + 4 + 2 * kk) ! parameters - named here - DOUBLE PRECISION rn(2) - COMMON /XCBPar/rn + !DOUBLE PRECISION rn(2) + !COMMON /XCBPar/rn ! local variables - CHARACTER(len=100) msg + !CHARACTER(len=100) msg !............................ statements .................................. @@ -216,7 +216,7 @@ SUBROUTINE daisie_runmod1 (neq, t, Conc, dConc, yout, ip) INTEGER :: neq, ip(*), i, ii DOUBLE PRECISION :: t, Conc(4 * N), dConc(4 * N), yout(*) DOUBLE PRECISION :: xx1(N + 3), xx2(N + 3), xx3(N + 3), xx4(N + 3) - INTEGER :: il1(N), il2(N), il3in3(N), il4(N) + INTEGER :: il1(N), il2(N), il3in3(N), il4(N) INTEGER :: in1(N), in2ix2(N), in4ix1(N) INTEGER :: ix3(N), ix4(N) DOUBLE PRECISION :: laavec(N + 4 + 2 * kk),lacvec(N + 4 + 2 * kk) @@ -226,7 +226,7 @@ SUBROUTINE daisie_runmod1 (neq, t, Conc, dConc, yout, ip) ! parameters - named here DOUBLE PRECISION rn(2) - COMMON /XCBPar/rn + !COMMON /XCBPar/rn ! local variables CHARACTER(len=100) msg @@ -389,7 +389,7 @@ SUBROUTINE daisie_runmod2 (neq, t, Conc, dConc, yout, ip) INTEGER :: neq, ip(*), i, ii DOUBLE PRECISION :: t, Conc(3 * N), dConc(3 * N), yout(*) DOUBLE PRECISION :: xx1(N + 3), xx2(N + 3), xx3(N + 3) - INTEGER :: il1(N), il2(N), il3in3(N), il4(N) + INTEGER :: il1(N), il2(N), il3in3(N), il4(N) INTEGER :: in1(N), in2ix2(N), in4ix1(N) INTEGER :: ix3(N), ix4(N) DOUBLE PRECISION :: laavec(N + 4 + 2 * kk),lacvec(N + 4 + 2 * kk) @@ -397,11 +397,11 @@ SUBROUTINE daisie_runmod2 (neq, t, Conc, dConc, yout, ip) DOUBLE PRECISION :: nn(N + 4 + 2 * kk) ! parameters - named here - DOUBLE PRECISION rn(2) - COMMON /XCBPar/rn + !DOUBLE PRECISION rn(2) + !COMMON /XCBPar/rn ! local variables - CHARACTER(len=100) msg + !CHARACTER(len=100) msg !............................ statements .................................. diff --git a/src/Makevars b/src/Makevars index 3e7f275e..c7b72e36 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,2 +1,3 @@ CXX_STD = CXX17 PKG_CPPFLAGS = -D_HAS_AUTO_PTR_ETC=0 +PKG_FFLAGS = -std=f2018 \ No newline at end of file From 80ed4eb3839a5e456b3cffc60f9fc6e06a046bca Mon Sep 17 00:00:00 2001 From: Hanno Hildenbrandt Date: Mon, 13 May 2024 17:14:26 +0200 Subject: [PATCH 2/2] -std=f2018 --- src/Makevars.win | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Makevars.win b/src/Makevars.win index 3e7f275e..f8113f6c 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,2 +1,3 @@ CXX_STD = CXX17 PKG_CPPFLAGS = -D_HAS_AUTO_PTR_ETC=0 +PKG_FFLAGS = -std=f2018