Fixed compilation issues from recent merge

LLNL · Nov 29, 2023 · 388fe09 · 388fe09
1 parent 80398b4
commit 388fe09
Show file tree

Hide file tree

Showing 23 changed files with 120 additions and 123 deletions.
diff --git a/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003.f90 b/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003.f90
@@ -668,7 +668,7 @@ integer(c_int) function TaskLocalLSolve(sunvec_delta, arkode_mem) &
     type(c_ptr), value :: arkode_mem   ! ARKODE memory structure
 
     ! residual data
-    type(c_ptr), value :: user_data
+    type(c_ptr) :: user_data
 
     real(c_double) :: tcur(1) ! current time
     real(c_double) :: gam(1)  ! current gamma

diff --git a/examples/arkode/F2003_parallel/ark_diag_kry_bbd_f2003.f90 b/examples/arkode/F2003_parallel/ark_diag_kry_bbd_f2003.f90
@@ -206,7 +206,6 @@ program driver
   integer(c_long) :: lenrwbbd(1) ! band preconditioner real/int workspace size
   integer(c_long) :: leniwbbd(1)
   integer :: i, ioutput
-  integer, pointer :: commptr
   real(c_double) :: errmax, erri, gerrmax
 
   ! Initialize MPI variables
@@ -236,8 +235,7 @@ program driver
   alpha = 10.0d0
 
   ! Create SUNDIALS simulation context, now that comm has been configured
-  commptr => comm
-  retval = FSUNContext_Create(c_loc(commptr), sunctx)
+  retval = FSUNContext_Create(comm, sunctx)
   if (retval /= 0) then
      print *, "Error: FSUNContext_Create returned ",retval
      call MPI_Abort(comm, 1, ierr)

diff --git a/examples/arkode/F2003_parallel/ark_diag_non_f2003.f90 b/examples/arkode/F2003_parallel/ark_diag_non_f2003.f90
@@ -147,7 +147,6 @@ program driver
   integer(c_long) :: nfe(1)     ! number of explicit RHS evals
   integer(c_long) :: netf(1)    ! number of error test fails
   integer :: i, ioutput
-  integer, pointer :: commptr
   real(c_double) :: errmax, erri, gerrmax
 
   ! Initialize MPI variables
@@ -177,8 +176,7 @@ program driver
   alpha = 10.0d0 / neq
 
   ! Create SUNDIALS simulation context, now that comm has been configured
-  commptr => comm
-  retval = FSUNContext_Create(c_loc(commptr), sunctx)
+  retval = FSUNContext_Create(comm, sunctx)
   if (retval /= 0) then
      print *, "Error: FSUNContext_Create returned ",retval
      call MPI_Abort(comm, 1, ierr)

diff --git a/examples/arkode/F2003_parallel/ark_heat2D_f2003.f90 b/examples/arkode/F2003_parallel/ark_heat2D_f2003.f90
@@ -699,7 +699,6 @@ program driver
   integer(c_long) :: npsol(1)   ! number of preconditioner solves
   integer :: i, j, ioutput
   character*100 :: outname
-  integer, pointer :: commptr
 
   ! initialize MPI
   call MPI_Init(ierr)
@@ -730,8 +729,7 @@ program driver
   end if
 
   ! Create SUNDIALS simulation context, now that comm has been configured
-  commptr => comm
-  retval = FSUNContext_Create(c_loc(commptr), sunctx)
+  retval = FSUNContext_Create(comm, sunctx)
   if (retval /= 0) then
      print *, "Error: FSUNContext_Create returned ",retval
      call MPI_Abort(comm, 1, ierr)

diff --git a/examples/arkode/F2003_serial/ark_bruss1D_FEM_klu_f2003.f90 b/examples/arkode/F2003_serial/ark_bruss1D_FEM_klu_f2003.f90
@@ -1028,6 +1028,7 @@ program main
   !======= Inclusions ===========
   use, intrinsic :: iso_c_binding
 
+  use fsundials_types_mod
   use bruss1D_ode_mod            ! custom problem-specification module
   use farkode_mod                ! Fortran interface to the ARKODE module
   use farkode_arkstep_mod        ! Fortran interface to the ARKStep module
@@ -1079,7 +1080,7 @@ program main
   !======= Internals ============
 
   ! create the SUNDIALS context
-  ierr = FSUNContext_Create(c_null_ptr, ctx)
+  ierr = FSUNContext_Create(SUN_COMM_NULL, ctx)
 
   ! initialize ODE
   tstart = 0.0d0

diff --git a/examples/arkode/F2003_serial/ark_bruss_f2003.f90 b/examples/arkode/F2003_serial/ark_bruss_f2003.f90
@@ -233,6 +233,7 @@ program main
   !======= Inclusions ===========
   use, intrinsic :: iso_c_binding
 
+  use fsundials_types_mod
   use farkode_mod                ! Fortran interface to the ARKODE module
   use farkode_arkstep_mod        ! Fortran interface to the ARKStep module
   use fsundials_nvector_mod      ! Fortran interface to the generic N_Vector
@@ -274,7 +275,7 @@ program main
   !======= Internals ============
 
   ! create the SUNDIALS context
-  ierr = FSUNContext_Create(c_null_ptr, sunctx)
+  ierr = FSUNContext_Create(SUN_COMM_NULL, sunctx)
 
   ! initialize ODE
   tstart = 0.0d0

diff --git a/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.f90 b/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.f90
@@ -213,6 +213,7 @@ program main
   !======= Inclusions ===========
   use, intrinsic :: iso_c_binding
 
+  use fsundials_types_mod
   use farkode_mod                ! Fortran interface to the ARKODE module
   use farkode_arkstep_mod        ! Fortran interface to the ARKStep module
   use fsundials_nvector_mod      ! Fortran interface to the generic N_Vector
@@ -251,7 +252,7 @@ program main
   !======= Internals ============
 
   ! create the SUNDIALS context
-  ierr = FSUNContext_Create(c_null_ptr, ctx)
+  ierr = FSUNContext_Create(SUN_COMM_NULL, ctx)
 
   ! initialize ODE
   tstart = 0.0d0

diff --git a/examples/arkode/F2003_serial/ark_roberts_dnsL_f2003.f90 b/examples/arkode/F2003_serial/ark_roberts_dnsL_f2003.f90
@@ -244,7 +244,7 @@ program main
   !======= Internals ============
 
   ! create the SUNDIALS context
-  retval = FSUNContext_Create(c_null_ptr, sunctx)
+  retval = FSUNContext_Create(SUN_COMM_NULL, sunctx)
 
   ! initialize solution vectors and tolerances
   yval(1)  = 1.d0

diff --git a/examples/arkode/F2003_serial/ark_roberts_dns_f2003.f90 b/examples/arkode/F2003_serial/ark_roberts_dns_f2003.f90
@@ -204,6 +204,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
@@ -245,7 +246,7 @@ program main
   !======= Internals ============
 
   ! create the SUNDIALS context
-  retval = FSUNContext_Create(c_null_ptr, sunctx)
+  retval = FSUNContext_Create(SUN_COMM_NULL, sunctx)
 
   ! initialize solution vectors and tolerances
   yval(1)  = 1.d0