From 856e8d6fcfb7b8168d2629343d310f462effa09f Mon Sep 17 00:00:00 2001 From: "Daniel R. Reynolds" Date: Wed, 29 Nov 2023 11:42:52 -0600 Subject: [PATCH] Additional fixes for 'very strict' compiler settings on Jenkins box --- .../ark_bruss1D_FEM_klu_f2003.f90 | 24 +++++++++---------- .../arkode/F2003_serial/ark_bruss_f2003.f90 | 1 - .../F2003_serial/ark_diurnal_kry_bp_f2003.f90 | 1 - .../F2003_serial/ark_roberts_dnsL_f2003.f90 | 1 + .../F2003_serial/ark_roberts_dns_f2003.f90 | 2 +- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/examples/arkode/F2003_serial/ark_bruss1D_FEM_klu_f2003.f90 b/examples/arkode/F2003_serial/ark_bruss1D_FEM_klu_f2003.f90 index e182891083..b6799607ec 100644 --- a/examples/arkode/F2003_serial/ark_bruss1D_FEM_klu_f2003.f90 +++ b/examples/arkode/F2003_serial/ark_bruss1D_FEM_klu_f2003.f90 @@ -71,19 +71,19 @@ module Bruss1DFEMKLU_UserData implicit none ! number of equations - integer(c_long), parameter :: neqreal = 3 + integer(c_int), parameter :: neqreal = 3 ! ODE parameters - integer(c_int), parameter :: N = 201 ! number of intervals - integer(c_long), parameter :: neq = neqreal*N ! set overall problem size - integer(c_long), parameter :: nnz = 15*neq - real(c_double), parameter :: a = 0.6d0 ! constant forcing on u - real(c_double), parameter :: b = 2.d0 ! steady-state value of w - real(c_double), parameter :: du = 2.5d-2 ! diffusion coeff for u - real(c_double), parameter :: dv = 2.5d-2 ! diffusion coeff for v - real(c_double), parameter :: dw = 2.5d-2 ! diffusion coeff for w - real(c_double), parameter :: ep = 1.d-5 ! stiffness parameter - real(c_double), dimension(N) :: x ! mesh node locations + integer(c_int), parameter :: N = 201 ! number of intervals + integer(c_int), parameter :: neq = neqreal*N ! set overall problem size + integer(c_int), parameter :: nnz = 15*neq + real(c_double), parameter :: a = 0.6d0 ! constant forcing on u + real(c_double), parameter :: b = 2.d0 ! steady-state value of w + real(c_double), parameter :: du = 2.5d-2 ! diffusion coeff for u + real(c_double), parameter :: dv = 2.5d-2 ! diffusion coeff for v + real(c_double), parameter :: dw = 2.5d-2 ! diffusion coeff for w + real(c_double), parameter :: ep = 1.d-5 ! stiffness parameter + real(c_double), dimension(N) :: x ! mesh node locations contains @@ -418,7 +418,7 @@ integer(c_int) function Jac(tn, sunvec_y, sunvec_f, sunmat_J, user_data, & integer(c_int) :: ix, nz, Nint real(c_double) :: ul, uc, ur, vl, vc, vr, wl, wc, wr, xl, xc, xr real(c_double) :: u1, u2, u3, v1, v2, v3, w1, w2, w3 - real(c_double) :: f1, f2, f3, df1, df2, df3, dQdf1, dQdf2, dQdf3 + real(c_double) :: df1, df2, df3, dQdf1, dQdf2, dQdf3 real(c_double) :: ChiL1, ChiL2, ChiL3, ChiR1, ChiR2, ChiR3 real(c_double), dimension(3,-1:1) :: Ju, Jv, Jw diff --git a/examples/arkode/F2003_serial/ark_bruss_f2003.f90 b/examples/arkode/F2003_serial/ark_bruss_f2003.f90 index aaa13b050d..0cc169fb65 100644 --- a/examples/arkode/F2003_serial/ark_bruss_f2003.f90 +++ b/examples/arkode/F2003_serial/ark_bruss_f2003.f90 @@ -261,7 +261,6 @@ program main integer(c_int) :: ierr ! error flag from C functions integer(c_int) :: nout ! number of outputs integer(c_int) :: outstep ! output loop counter - integer(c_long) :: mxsteps ! max num steps real(c_double), parameter :: nlscoef = 1.d-2 ! non-linear solver coefficient integer(c_int), parameter :: order = 3 ! method order diff --git a/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.f90 b/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.f90 index 8922336714..ba295a786a 100644 --- a/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.f90 +++ b/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.f90 @@ -423,7 +423,6 @@ subroutine ARKStepStats(arkode_mem) integer(c_long) :: nliters(1) ! linear solver iterations integer(c_long) :: ncf(1) ! num convergence failures nonlinear integer(c_long) :: ncfl(1) ! num convergence failures linear - integer(c_long) :: nncfails(1) ! nonlinear solver fails integer(c_long) :: lenrw(1) ! main solver real/int workspace size integer(c_long) :: leniw(1) integer(c_long) :: lenrwls(1) ! linear solver real/int workspace size diff --git a/examples/arkode/F2003_serial/ark_roberts_dnsL_f2003.f90 b/examples/arkode/F2003_serial/ark_roberts_dnsL_f2003.f90 index 2cb70b62fb..2aedc669ec 100644 --- a/examples/arkode/F2003_serial/ark_roberts_dnsL_f2003.f90 +++ b/examples/arkode/F2003_serial/ark_roberts_dnsL_f2003.f90 @@ -203,6 +203,7 @@ program main !======= Inclusions =========== use, intrinsic :: iso_c_binding + use fsundials_types_mod use farkode_mod ! Fortran interface to ARKODE use farkode_arkstep_mod ! Fortran interface to the ARKStep module use fsundials_context_mod ! Fortran interface to SUNContext diff --git a/examples/arkode/F2003_serial/ark_roberts_dns_f2003.f90 b/examples/arkode/F2003_serial/ark_roberts_dns_f2003.f90 index 3975a9ee51..fc4c895219 100644 --- a/examples/arkode/F2003_serial/ark_roberts_dns_f2003.f90 +++ b/examples/arkode/F2003_serial/ark_roberts_dns_f2003.f90 @@ -509,7 +509,7 @@ subroutine PrintOutput(arkode_mem, t, y) real(c_double) :: t, y(neq) ! internal variables - integer(c_int) :: retval, kused(1) + integer(c_int) :: retval integer(c_long) :: nst(1) real(c_double) :: hused(1)