Merge branch 'feature/sunindextype-long-int-fixes' into bugfix/window…

…s-fortran-builds
LLNL · Feb 26, 2024 · 88b6c44 · 88b6c44
2 parents f976102 + ead7727
commit 88b6c44
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/src/arkode/arkode_bbdpre.c b/src/arkode/arkode_bbdpre.c
@@ -56,7 +56,8 @@ int ARKBBDPrecInit(void* arkode_mem, sunindextype Nlocal, sunindextype mudq,
   ARKodeMem ark_mem;
   ARKLsMem arkls_mem;
   ARKBBDPrecData pdata;
-  sunindextype muk, mlk, storage_mu, lrw1, liw1;
+  sunindextype muk, mlk, storage_mu;
+  long int lrw1, liw1;
   long int lrw, liw;
   int retval;
 

diff --git a/src/cvode/cvode_bbdpre.c b/src/cvode/cvode_bbdpre.c
@@ -60,8 +60,8 @@ int CVBBDPrecInit(void* cvode_mem, sunindextype Nlocal, sunindextype mudq,
   CVodeMem cv_mem;
   CVLsMem cvls_mem;
   CVBBDPrecData pdata;
-  sunindextype muk, mlk, storage_mu, lrw1, liw1;
-  long int lrw, liw;
+  sunindextype muk, mlk, storage_mu;
+  long int lrw, liw, lrw1, liw1;
   int flag;
 
   if (cvode_mem == NULL)

diff --git a/src/cvodes/cvodes_bbdpre.c b/src/cvodes/cvodes_bbdpre.c
@@ -72,8 +72,8 @@ int CVBBDPrecInit(void* cvode_mem, sunindextype Nlocal, sunindextype mudq,
   CVodeMem cv_mem;
   CVLsMem cvls_mem;
   CVBBDPrecData pdata;
-  sunindextype muk, mlk, storage_mu, lrw1, liw1;
-  long int lrw, liw;
+  sunindextype muk, mlk, storage_mu;
+  long int lrw, liw, lrw1, liw1;;
   int flag;
 
   if (cvode_mem == NULL)

diff --git a/src/ida/ida_bbdpre.c b/src/ida/ida_bbdpre.c
@@ -62,8 +62,8 @@ int IDABBDPrecInit(void* ida_mem, sunindextype Nlocal, sunindextype mudq,
   IDAMem IDA_mem;
   IDALsMem idals_mem;
   IBBDPrecData pdata;
-  sunindextype muk, mlk, storage_mu, lrw1, liw1;
-  long int lrw, liw;
+  sunindextype muk, mlk, storage_mu;
+  long int lrw, liw, lrw1, liw1;
   int flag;
 
   if (ida_mem == NULL)

diff --git a/src/ida/ida_ls.c b/src/ida/ida_ls.c
@@ -598,8 +598,7 @@ int IDAGetLinWorkSpace(void* ida_mem, long int* lenrwLS, long int* leniwLS)
 {
   IDAMem IDA_mem;
   IDALsMem idals_mem;
-  long int lrw1, liw1;
-  long int lrw, liw;
+  long int lrw, liw, lrw1, liw1;
   int retval;
 
   /* access IDALsMem structure */

diff --git a/src/idas/idas_bbdpre.c b/src/idas/idas_bbdpre.c
@@ -76,8 +76,8 @@ int IDABBDPrecInit(void* ida_mem, sunindextype Nlocal, sunindextype mudq,
   IDAMem IDA_mem;
   IDALsMem idals_mem;
   IBBDPrecData pdata;
-  sunindextype muk, mlk, storage_mu, lrw1, liw1;
-  long int lrw, liw;
+  sunindextype muk, mlk, storage_mu;
+  long int lrw, liw, lrw1, liw1;
   int flag;
 
   if (ida_mem == NULL)

diff --git a/src/idas/idas_ls.c b/src/idas/idas_ls.c
@@ -639,8 +639,7 @@ int IDAGetLinWorkSpace(void* ida_mem, long int* lenrwLS, long int* leniwLS)
 {
   IDAMem IDA_mem;
   IDALsMem idals_mem;
-  long int lrw1, liw1;
-  long int lrw, liw;
+  long int lrw, liw, lrw1, liw1;
   int retval;
 
   /* access IDALsMem structure */

diff --git a/src/kinsol/kinsol_bbdpre.c b/src/kinsol/kinsol_bbdpre.c
@@ -63,8 +63,8 @@ int KINBBDPrecInit(void* kinmem, sunindextype Nlocal, sunindextype mudq,
   KINMem kin_mem;
   KINLsMem kinls_mem;
   KBBDPrecData pdata;
-  sunindextype muk, mlk, storage_mu, lrw1, liw1;
-  long int lrw, liw;
+  sunindextype muk, mlk, storage_mu;
+  long int lrw, liw, lrw1, liw1;
   int flag;
 
   if (kinmem == NULL)

diff --git a/src/nvector/manyvector/nvector_manyvector.c b/src/nvector/manyvector/nvector_manyvector.c
@@ -572,7 +572,8 @@ void MVAPPEND(N_VDestroy)(N_Vector v)
 void MVAPPEND(N_VSpace)(N_Vector v, long int* lrw, long int* liw)
 {
   SUNFunctionBegin(v->sunctx);
-  sunindextype i, lrw1, liw1;
+  sunindextype i;
+  long int lrw1, liw1;
   *lrw = 0;
   *liw = 0;
   for (i = 0; i < MANYVECTOR_NUM_SUBVECS(v); i++)