Merge pull request #166 from rsetienne/f2018

F2018
rsetienne · Jul 1, 2024 · f8dc008 · f8dc008
2 parents 80f7bb2 + 80ed4eb
commit f8dc008
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git 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,19 +89,19 @@ 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)
       DOUBLE PRECISION  :: muvec(N + 4 + 2 * kk),gamvec(N + 4 + 2 * kk)
       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,19 +389,19 @@ 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)
       DOUBLE PRECISION  :: muvec(N + 4 + 2 * kk),gamvec(N + 4 + 2 * kk)
       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
@@ -1,2 +1,3 @@
 CXX_STD = CXX17
 PKG_CPPFLAGS = -D_HAS_AUTO_PTR_ETC=0
+PKG_FFLAGS = -std=f2018
diff --git 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