From 4bef21398cd03efbf2b40c98c57ba51406c356a2 Mon Sep 17 00:00:00 2001 From: "Balos, Cody, J" Date: Mon, 26 Feb 2024 11:23:54 -0800 Subject: [PATCH 1/2] fix nvector space op --- include/sundials/sundials_nvector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/sundials/sundials_nvector.h b/include/sundials/sundials_nvector.h index 61d966e29e..362e7c5e76 100644 --- a/include/sundials/sundials_nvector.h +++ b/include/sundials/sundials_nvector.h @@ -108,7 +108,7 @@ struct _generic_N_Vector_Ops N_Vector (*nvclone)(N_Vector); N_Vector (*nvcloneempty)(N_Vector); void (*nvdestroy)(N_Vector); - void (*nvspace)(N_Vector, sunindextype*, sunindextype*); + void (*nvspace)(N_Vector, long int*, long int*); sunrealtype* (*nvgetarraypointer)(N_Vector); sunrealtype* (*nvgetdevicearraypointer)(N_Vector); void (*nvsetarraypointer)(sunrealtype*, N_Vector); From 37875a7a711fdda28124c7ccb4151c92db80b8e4 Mon Sep 17 00:00:00 2001 From: "Balos, Cody, J" Date: Mon, 26 Feb 2024 11:24:01 -0800 Subject: [PATCH 2/2] regen fortran --- src/arkode/fmod/farkode_mod.c | 20 +++++++++---------- src/arkode/fmod/farkode_mod.f90 | 8 ++++---- src/arkode/fmod/farkode_mristep_mod.c | 10 +++++----- src/arkode/fmod/farkode_mristep_mod.f90 | 4 ++-- .../manyvector/fmod/fnvector_manyvector_mod.c | 10 +++++----- .../fmod/fnvector_manyvector_mod.f90 | 4 ++-- .../fmod/fnvector_mpimanyvector_mod.c | 10 +++++----- .../fmod/fnvector_mpimanyvector_mod.f90 | 4 ++-- src/nvector/openmp/fmod/fnvector_openmp_mod.c | 10 +++++----- .../openmp/fmod/fnvector_openmp_mod.f90 | 4 ++-- .../parallel/fmod/fnvector_parallel_mod.c | 10 +++++----- .../parallel/fmod/fnvector_parallel_mod.f90 | 4 ++-- .../pthreads/fmod/fnvector_pthreads_mod.c | 10 +++++----- .../pthreads/fmod/fnvector_pthreads_mod.f90 | 4 ++-- src/nvector/serial/fmod/fnvector_serial_mod.c | 10 +++++----- .../serial/fmod/fnvector_serial_mod.f90 | 4 ++-- src/sundials/fmod/fsundials_core_mod.c | 10 +++++----- src/sundials/fmod/fsundials_core_mod.f90 | 4 ++-- 18 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/arkode/fmod/farkode_mod.c b/src/arkode/fmod/farkode_mod.c index a66b1b0dcd..a37c50d95f 100644 --- a/src/arkode/fmod/farkode_mod.c +++ b/src/arkode/fmod/farkode_mod.c @@ -688,14 +688,14 @@ SWIGEXPORT void * _wrap_FARKodeButcherTable_Copy(void *farg1) { } -SWIGEXPORT void _wrap_FARKodeButcherTable_Space(void *farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FARKodeButcherTable_Space(void *farg1, long *farg2, long *farg3) { ARKodeButcherTable arg1 = (ARKodeButcherTable) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (ARKodeButcherTable)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); ARKodeButcherTable_Space(arg1,arg2,arg3); } @@ -1019,14 +1019,14 @@ SWIGEXPORT void _wrap_FARKodeSPRKTable_Write(void *farg1, void *farg2) { } -SWIGEXPORT void _wrap_FARKodeSPRKTable_Space(void *farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FARKodeSPRKTable_Space(void *farg1, long *farg2, long *farg3) { ARKodeSPRKTable arg1 = (ARKodeSPRKTable) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (ARKodeSPRKTable)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); ARKodeSPRKTable_Space(arg1,arg2,arg3); } diff --git a/src/arkode/fmod/farkode_mod.f90 b/src/arkode/fmod/farkode_mod.f90 index 7724193873..4e62dc08f4 100644 --- a/src/arkode/fmod/farkode_mod.f90 +++ b/src/arkode/fmod/farkode_mod.f90 @@ -1229,8 +1229,8 @@ function FARKodeButcherTable_Copy(b) & subroutine FARKodeButcherTable_Space(b, liw, lrw) use, intrinsic :: ISO_C_BINDING type(C_PTR) :: b -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 @@ -1621,8 +1621,8 @@ subroutine FARKodeSPRKTable_Write(sprk_table, outfile) subroutine FARKodeSPRKTable_Space(sprk_storage, liw, lrw) use, intrinsic :: ISO_C_BINDING type(C_PTR) :: sprk_storage -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/arkode/fmod/farkode_mristep_mod.c b/src/arkode/fmod/farkode_mristep_mod.c index c9fc9edf0c..cac8323310 100644 --- a/src/arkode/fmod/farkode_mristep_mod.c +++ b/src/arkode/fmod/farkode_mristep_mod.c @@ -599,14 +599,14 @@ SWIGEXPORT void * _wrap_FMRIStepCoupling_Copy(void *farg1) { } -SWIGEXPORT void _wrap_FMRIStepCoupling_Space(void *farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FMRIStepCoupling_Space(void *farg1, long *farg2, long *farg3) { MRIStepCoupling arg1 = (MRIStepCoupling) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (MRIStepCoupling)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); MRIStepCoupling_Space(arg1,arg2,arg3); } diff --git a/src/arkode/fmod/farkode_mristep_mod.f90 b/src/arkode/fmod/farkode_mristep_mod.f90 index 163f24f8f8..bb76bee620 100644 --- a/src/arkode/fmod/farkode_mristep_mod.f90 +++ b/src/arkode/fmod/farkode_mristep_mod.f90 @@ -1732,8 +1732,8 @@ function FMRIStepCoupling_Copy(mric) & subroutine FMRIStepCoupling_Space(mric, liw, lrw) use, intrinsic :: ISO_C_BINDING type(C_PTR) :: mric -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c b/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c index 3cd395bf66..7012d29bf1 100644 --- a/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c +++ b/src/nvector/manyvector/fmod/fnvector_manyvector_mod.c @@ -328,14 +328,14 @@ SWIGEXPORT void _wrap_FN_VDestroy_ManyVector(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace_ManyVector(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace_ManyVector(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace_ManyVector(arg1,arg2,arg3); } diff --git a/src/nvector/manyvector/fmod/fnvector_manyvector_mod.f90 b/src/nvector/manyvector/fmod/fnvector_manyvector_mod.f90 index 1c747bb028..c36042496f 100644 --- a/src/nvector/manyvector/fmod/fnvector_manyvector_mod.f90 +++ b/src/nvector/manyvector/fmod/fnvector_manyvector_mod.f90 @@ -744,8 +744,8 @@ subroutine FN_VDestroy_ManyVector(v) subroutine FN_VSpace_ManyVector(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c b/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c index 2374d9a846..bbf156e18c 100644 --- a/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c +++ b/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.c @@ -356,14 +356,14 @@ SWIGEXPORT void _wrap_FN_VDestroy_MPIManyVector(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace_MPIManyVector(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace_MPIManyVector(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace_MPIManyVector(arg1,arg2,arg3); } diff --git a/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.f90 b/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.f90 index d214fc462b..a4bb027bcb 100644 --- a/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.f90 +++ b/src/nvector/manyvector/fmod/fnvector_mpimanyvector_mod.f90 @@ -866,8 +866,8 @@ subroutine FN_VDestroy_MPIManyVector(v) subroutine FN_VSpace_MPIManyVector(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/nvector/openmp/fmod/fnvector_openmp_mod.c b/src/nvector/openmp/fmod/fnvector_openmp_mod.c index 34f3b918df..d173984a44 100644 --- a/src/nvector/openmp/fmod/fnvector_openmp_mod.c +++ b/src/nvector/openmp/fmod/fnvector_openmp_mod.c @@ -332,14 +332,14 @@ SWIGEXPORT void _wrap_FN_VDestroy_OpenMP(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace_OpenMP(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace_OpenMP(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace_OpenMP(arg1,arg2,arg3); } diff --git a/src/nvector/openmp/fmod/fnvector_openmp_mod.f90 b/src/nvector/openmp/fmod/fnvector_openmp_mod.f90 index bcdc99e1bf..50a2618282 100644 --- a/src/nvector/openmp/fmod/fnvector_openmp_mod.f90 +++ b/src/nvector/openmp/fmod/fnvector_openmp_mod.f90 @@ -718,8 +718,8 @@ subroutine FN_VDestroy_OpenMP(v) subroutine FN_VSpace_OpenMP(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/nvector/parallel/fmod/fnvector_parallel_mod.c b/src/nvector/parallel/fmod/fnvector_parallel_mod.c index 877640429b..3d0aa44e17 100644 --- a/src/nvector/parallel/fmod/fnvector_parallel_mod.c +++ b/src/nvector/parallel/fmod/fnvector_parallel_mod.c @@ -380,14 +380,14 @@ SWIGEXPORT void _wrap_FN_VDestroy_Parallel(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace_Parallel(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace_Parallel(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace_Parallel(arg1,arg2,arg3); } diff --git a/src/nvector/parallel/fmod/fnvector_parallel_mod.f90 b/src/nvector/parallel/fmod/fnvector_parallel_mod.f90 index c4a036de7b..715a254c19 100644 --- a/src/nvector/parallel/fmod/fnvector_parallel_mod.f90 +++ b/src/nvector/parallel/fmod/fnvector_parallel_mod.f90 @@ -862,8 +862,8 @@ subroutine FN_VDestroy_Parallel(v) subroutine FN_VSpace_Parallel(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c index 76af5ca784..31aae83b2b 100644 --- a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c +++ b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.c @@ -332,14 +332,14 @@ SWIGEXPORT void _wrap_FN_VDestroy_Pthreads(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace_Pthreads(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace_Pthreads(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace_Pthreads(arg1,arg2,arg3); } diff --git a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90 b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90 index d3b92e8269..5af51476e6 100644 --- a/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90 +++ b/src/nvector/pthreads/fmod/fnvector_pthreads_mod.f90 @@ -718,8 +718,8 @@ subroutine FN_VDestroy_Pthreads(v) subroutine FN_VSpace_Pthreads(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/nvector/serial/fmod/fnvector_serial_mod.c b/src/nvector/serial/fmod/fnvector_serial_mod.c index 7611d0b848..191dd35b8c 100644 --- a/src/nvector/serial/fmod/fnvector_serial_mod.c +++ b/src/nvector/serial/fmod/fnvector_serial_mod.c @@ -326,14 +326,14 @@ SWIGEXPORT void _wrap_FN_VDestroy_Serial(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace_Serial(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace_Serial(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace_Serial(arg1,arg2,arg3); } diff --git a/src/nvector/serial/fmod/fnvector_serial_mod.f90 b/src/nvector/serial/fmod/fnvector_serial_mod.f90 index bbdc76c8b7..f789b7932b 100644 --- a/src/nvector/serial/fmod/fnvector_serial_mod.f90 +++ b/src/nvector/serial/fmod/fnvector_serial_mod.f90 @@ -706,8 +706,8 @@ subroutine FN_VDestroy_Serial(v) subroutine FN_VSpace_Serial(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3 diff --git a/src/sundials/fmod/fsundials_core_mod.c b/src/sundials/fmod/fsundials_core_mod.c index 4af16b91a4..da4a940a20 100644 --- a/src/sundials/fmod/fsundials_core_mod.c +++ b/src/sundials/fmod/fsundials_core_mod.c @@ -906,14 +906,14 @@ SWIGEXPORT void _wrap_FN_VDestroy(N_Vector farg1) { } -SWIGEXPORT void _wrap_FN_VSpace(N_Vector farg1, int64_t *farg2, int64_t *farg3) { +SWIGEXPORT void _wrap_FN_VSpace(N_Vector farg1, long *farg2, long *farg3) { N_Vector arg1 = (N_Vector) 0 ; - sunindextype *arg2 = (sunindextype *) 0 ; - sunindextype *arg3 = (sunindextype *) 0 ; + long *arg2 = (long *) 0 ; + long *arg3 = (long *) 0 ; arg1 = (N_Vector)(farg1); - arg2 = (sunindextype *)(farg2); - arg3 = (sunindextype *)(farg3); + arg2 = (long *)(farg2); + arg3 = (long *)(farg3); N_VSpace(arg1,arg2,arg3); } diff --git a/src/sundials/fmod/fsundials_core_mod.f90 b/src/sundials/fmod/fsundials_core_mod.f90 index 4334dfe0d3..ac4e05c382 100644 --- a/src/sundials/fmod/fsundials_core_mod.f90 +++ b/src/sundials/fmod/fsundials_core_mod.f90 @@ -2743,8 +2743,8 @@ subroutine FN_VDestroy(v) subroutine FN_VSpace(v, lrw, liw) use, intrinsic :: ISO_C_BINDING type(N_Vector), target, intent(inout) :: v -integer(C_INT64_T), dimension(*), target, intent(inout) :: lrw -integer(C_INT64_T), dimension(*), target, intent(inout) :: liw +integer(C_LONG), dimension(*), target, intent(inout) :: lrw +integer(C_LONG), dimension(*), target, intent(inout) :: liw type(C_PTR) :: farg1 type(C_PTR) :: farg2 type(C_PTR) :: farg3